Changeset 1853

Timestamp:

01/05/12 16:19:12 (5 months ago)

Author:

Dylan

Message:

unxsVZ migration of stopped containers work continues.

Location:

trunk

Files:

• jobqueue.c (modified) (5 diffs)
• tcontainerfunc.h (modified) (6 diffs)

trunk/jobqueue.c

@@ -1513 +1513 @@
         unsigned uTargetDatacenter=0;
         unsigned uIPv4=0;
-        unsigned uStatus=0;
+        unsigned uPrevStatus=0;
 
         sscanf(cJobData,"uTargetNode=%u;",&uTargetNode);
@@ -1523 +1523 @@
         }
 
-        if(GetContainerStatus(uContainer,&uStatus))
-        {
-                logfileLine("MigrateContainer","GetContainerStatus() failed");
-                tJobErrorUpdate(uJob,"GetContainerStatus()");
-                return;
-        }
 
         sscanf(cJobData,"uTargetNode=%*u;\nuIPv4=%u;",&uIPv4);
@@ -1551 +1545 @@
                 logfileLine("MigrateContainer","Could not determine cTargetNodeIPv4");
                 tJobErrorUpdate(uJob,"cTargetNodeIPv4");
+                return;
+        }
+
+        sscanf(cJobData,"uTargetNode=%*u;\nuIPv4=%*u;\nuPrevStatus=%u;",&uPrevStatus);
+        if(uPrevStatus!=uACTIVE || uPrevStatus!=uSTOPPED)
+        {
+                logfileLine("MigrateContainer","Could not determine uPrevStatus");
+                tJobErrorUpdate(uJob,"uPrevStatus==0");
                 return;
         }
@@ -1584 +1586 @@
 
 
-        if(uStatus==uACTIVE)
+        if(uPrevStatus==uACTIVE)
         {
                 if(cSSHOptions[0])
@@ -1641 +1643 @@
 
         //Everything ok
-        SetContainerStatus(uContainer,1);//Active
+        SetContainerStatus(uContainer,uPrevStatus);//Previous to awaiting migration
         SetContainerNode(uContainer,uTargetNode);//Migrated!
         if(uIPv4 && uTargetDatacenter)

trunk/tcontainerfunc.h

@@ -102 +102 @@
 void htmlContainerMount(unsigned uContainer);
 unsigned MigrateContainerJob(unsigned uDatacenter, unsigned uNode, unsigned uContainer, unsigned uTargetNode,
-                        unsigned uOwner, unsigned uLoginClient, unsigned uIPv4);
+                        unsigned uOwner, unsigned uLoginClient, unsigned uIPv4,unsigned uPrevStatus);
 unsigned CloneContainerJob(unsigned uDatacenter, unsigned uNode, unsigned uContainer,
                                 unsigned uTargetNode, unsigned uNewVeid, unsigned uPrevStatus,
@@ -2774 +2774 @@
                                         ChangeGroup(uContainer,uGroup);
 
-                                if(MigrateContainerJob(uDatacenter,uNode,uContainer,uTargetNode,uOwner,guLoginClient,0))
+                                if(MigrateContainerJob(uDatacenter,uNode,uContainer,uTargetNode,uOwner,guLoginClient,0,uStatus))
                                 {
                                         uStatus=uAWAITMIG;
-                                        SetContainerStatus(uContainer,21);//Awaiting Migration
+                                        SetContainerStatus(uContainer,uAWAITMIG);//Awaiting Migration
                                         sscanf(ForeignKey("tContainer","uModDate",uContainer),"%lu",&uModDate);
                                         tContainer("MigrateContainerJob() Done");
@@ -2867 +2867 @@
                                         ChangeGroup(uContainer,uGroup);
 
-                                if(MigrateContainerJob(uDatacenter,uNode,uContainer,uTargetNode,uOwner,guLoginClient,uWizIPv4))
+                                if(MigrateContainerJob(uDatacenter,uNode,uContainer,uTargetNode,uOwner,guLoginClient,uWizIPv4,uStatus))
                                 {
                                         char cIPOld[32]={""};
 
                                         uStatus=uAWAITMIG;
-                                        SetContainerStatus(uContainer,21);//Awaiting Migration
+                                        SetContainerStatus(uContainer,uAWAITMIG);//Awaiting Migration
 
                                         //Mark IP used
@@ -5020 +5020 @@
 
 unsigned MigrateContainerJob(unsigned uDatacenter, unsigned uNode, unsigned uContainer, unsigned uTargetNode,
-                        unsigned uOwner, unsigned uLoginClient, unsigned uIPv4)
+                        unsigned uOwner, unsigned uLoginClient, unsigned uIPv4,unsigned uPrevStatus)
 {
         unsigned uCount=0;
@@ -5028 +5028 @@
                         ",uJobDate=UNIX_TIMESTAMP(NOW())+60"
                         ",uJobStatus=1"
-                        ",cJobData='uTargetNode=%u;\nuIPv4=%u;'"
+                        ",cJobData='uTargetNode=%u;\nuIPv4=%u;\nuPrevStatus=%u;\n'"
                         ",uOwner=%u,uCreatedBy=%u,uCreatedDate=UNIX_TIMESTAMP(NOW())",
                                 uContainer,uTargetNode,
@@ -5034 +5034 @@
                                 uTargetNode,
                                 uIPv4,
+                                uPrevStatus,
                                 uOwner,uLoginClient);
         mysql_query(&gMysql,gcQuery);