Changeset 1852

Timestamp:

01/05/12 13:43:14 (5 months ago)

Author:

Dylan

Message:

unxsVZ added migration of stopped container support.

Location:

trunk

Files:

• jobqueue.c (modified) (3 diffs)
• tcontainerfunc.h (modified) (4 diffs)
• tnodefunc.h (modified) (3 diffs)

trunk/jobqueue.c

@@ -1513 +1513 @@
         unsigned uTargetDatacenter=0;
         unsigned uIPv4=0;
+        unsigned uStatus=0;
 
         sscanf(cJobData,"uTargetNode=%u;",&uTargetNode);
@@ -1519 +1520 @@
                 logfileLine("MigrateContainer","Could not determine uTargetNode");
                 tJobErrorUpdate(uJob,"uTargetNode==0");
+                return;
+        }
+
+        if(GetContainerStatus(uContainer,&uStatus))
+        {
+                logfileLine("MigrateContainer","GetContainerStatus() failed");
+                tJobErrorUpdate(uJob,"GetContainerStatus()");
                 return;
         }
@@ -1575 +1583 @@
                 sprintf(cSCPOptions,"-P 22 -c arcfour");
 
-        if(cSSHOptions[0])
-                sprintf(gcQuery,"export PATH=/usr/sbin:/usr/bin:/bin:/usr/local/bin:/usr/local/sbin;"
+
+        if(uStatus==uACTIVE)
+        {
+                if(cSSHOptions[0])
+                        sprintf(gcQuery,"export PATH=/usr/sbin:/usr/bin:/bin:/usr/local/bin:/usr/local/sbin;"
                                 "/usr/sbin/vzmigrate --ssh=\"%s\" --keep-dst --online -v %s %u",
                                         cSSHOptions,cTargetNodeIPv4,uContainer);
-        else
-                sprintf(gcQuery,"export PATH=/usr/sbin:/usr/bin:/bin;"
+                else
+                        sprintf(gcQuery,"export PATH=/usr/sbin:/usr/bin:/bin;"
                                 "/usr/sbin/vzmigrate --keep-dst --online -v %s %u",
                                         cTargetNodeIPv4,uContainer);
+        }
+        else
+        {
+                if(cSSHOptions[0])
+                        sprintf(gcQuery,"export PATH=/usr/sbin:/usr/bin:/bin:/usr/local/bin:/usr/local/sbin;"
+                                "/usr/sbin/vzmigrate --ssh=\"%s\" --keep-dst -v %s %u",
+                                        cSSHOptions,cTargetNodeIPv4,uContainer);
+                else
+                        sprintf(gcQuery,"export PATH=/usr/sbin:/usr/bin:/bin;"
+                                "/usr/sbin/vzmigrate --keep-dst -v %s %u",
+                                        cTargetNodeIPv4,uContainer);
+        }
+
         if(system(gcQuery))
         {
                 //We may not want this optional behavior may violate QoS for given migration
-                logfileLine("MigrateContainer","Trying offline migration (check kernel compat)");
-                tJobErrorUpdate(uJob,"Live failed trying offline");
+                logfileLine("MigrateContainer","Trying offline migration");
+                tJobErrorUpdate(uJob,"Failed once trying offline");
 
                 if(cSSHOptions[0])

trunk/tcontainerfunc.h

@@ -2726 +2726 @@
                 {
                         ProcesstContainerVars(entries,x);
-                        if(uStatus==uACTIVE && uAllowMod(uOwner,uCreatedBy))
+                        if( (uStatus==uACTIVE || uStatus==uSTOPPED ) && uAllowMod(uOwner,uCreatedBy))
                         {
                                 guMode=0;
@@ -2744 +2744 @@
                 {
                         ProcesstContainerVars(entries,x);
-                        if(uStatus==uACTIVE && uAllowMod(uOwner,uCreatedBy))
+                        if( (uStatus==uACTIVE || uStatus==uSTOPPED ) && uAllowMod(uOwner,uCreatedBy))
                         {
                                 unsigned uTargetDatacenter=0;
@@ -3979 +3979 @@
                                 {
                                         htmlHealth(uContainer,3);
-                                        printf("<p><input title='Migrate container to another hardware node'"
-                                        " type=submit class=largeButton"
-                                        " name=gcCommand value='Migration Wizard'><br>\n");
-                                        printf("<input title='Migrate container to another datacenter node'"
+                                        printf("<p><input title='Migrate container to another datacenter node'"
                                         " type=submit class=largeButton"
                                         " name=gcCommand value='Remote Migration'><br>\n");
@@ -4031 +4028 @@
                                 if( uStatus==uSTOPPED || uStatus==uACTIVE )
                                 {
+                                        printf("<input title='Migrate container to another hardware node'"
+                                        " type=submit class=largeButton"
+                                        " name=gcCommand value='Migration Wizard'><br>\n");
                                         printf("<input title='Change current container name and hostname'"
                                         " type=submit class=largeButton"

trunk/tnodefunc.h

@@ -593 +593 @@
                                 "<td><u>clone hostname</u></td>"
                                 "<td><u>seconds since rsync</u></td>"
-                                "<td><u>job created</u></td>"
                                 "</tr>");
                         sprintf(gcQuery,"SELECT tContainer.uContainer,tContainer.cLabel,tContainer.cHostname,"
@@ -611 +610 @@
                                 MYSQL_RES *res2;
                                 MYSQL_ROW field2;
+                                long unsigned luTotalDiskSpace=0;
+                                long unsigned luDiskSpace;
 
                                 while((field=mysql_fetch_row(res)))
@@ -644 +645 @@
                                         mysql_free_result(res2);
                                         printf("</tr>\n");
+
+                                        sprintf(gcQuery,"SELECT cValue FROM tProperty"
+                                                        " WHERE cName='1k-blocks.luUsage' AND uType=3 AND uKey=%s",field[0]);
+                                        mysql_query(&gMysql,gcQuery);
+                                        if(mysql_errno(&gMysql))
+                                                htmlPlainTextError(mysql_error(&gMysql));
+                                        res2=mysql_store_result(&gMysql);
+                                        if((field2=mysql_fetch_row(res2)))
+                                        {
+                                                luDiskSpace=0;
+                                                sscanf(field2[0],"%lu",&luDiskSpace);
+                                                luTotalDiskSpace+=luDiskSpace;
+                                        }
+                                        mysql_free_result(res2);
+
                                 }
-                                //printf("<tr><td><input type=checkbox name=all onClick='checkAll(document.formMain,this)'>"
-                                //              " Check all</td></tr>\n");
+                                printf("<tr><td>Total disk space used: %lu</td></tr>",luTotalDiskSpace);
                         }
                         printf("</table>");