Changeset 1860

Timestamp:

02/01/12 07:07:07 (4 months ago)

Author:

Dylan

Message:

unxsVZ minor extensions to datacenter and container tabs.

Location:

trunk

Files:

• tcontainerfunc.h (modified) (6 diffs)
• tdatacenterfunc.h (modified) (1 diff)

trunk/tcontainerfunc.h

@@ -2796 +2796 @@
                 {
                         ProcesstContainerVars(entries,x);
-                        if(uStatus==uACTIVE && uAllowMod(uOwner,uCreatedBy))
+                        if( (uStatus==uACTIVE||uStatus==uSTOPPED) && uAllowMod(uOwner,uCreatedBy))
                         {
                                 guMode=0;
@@ -2814 +2814 @@
                 {
                         ProcesstContainerVars(entries,x);
-                        if(uStatus==uACTIVE && uAllowMod(uOwner,uCreatedBy))
+                        if( (uStatus==uACTIVE||uStatus==uSTOPPED) && uAllowMod(uOwner,uCreatedBy))
                         {
                                 unsigned uTargetDatacenter=0;
@@ -2859 +2859 @@
                                         tContainer("<blink>Error:</blink> Create job for unxsBind,"
                                                                 " but no cunxsBindARecordJobZone");
+
+                                //label-cloneN and hostname.cloneN mess change to new format
+                                // new hostname is based on source cLabel and cHostname
+                                char cPrevHostname[100]={""};
+                                if(uSource)
+                                {
+                                        char cSourceHostname[100]={""};
+                                        char cWizLabel[33]={""};
+                                        char cNewLabel[33]={""};
+                                        char *cp=NULL;
+                                        unsigned uWizLabelLoop=1;
+                                        unsigned uWizLabelSuffix=0;
+
+                                        sprintf(cPrevHostname,"%s",cHostname);
+
+                                        sprintf(cLabel,"%.25s",ForeignKey("tContainer","cLabel",uSource));
+                                        //Get first available <cLabel>-clone<uNum>
+                                        while(uWizLabelLoop)
+                                        {
+                                                uWizLabelSuffix++;
+                                                if(uWizLabelSuffix>9) tContainer("<blink>Error:</blink> Clone limit reached");
+                                                sprintf(cWizLabel,"%.25s-clone%u",cLabel,uWizLabelSuffix);
+                                                sprintf(gcQuery,"SELECT uContainer FROM tContainer WHERE cLabel='%s'",cWizLabel);
+                                                mysql_query(&gMysql,gcQuery);
+                                                if(mysql_errno(&gMysql))
+                                                        htmlPlainTextError(mysql_error(&gMysql));
+                                                res=mysql_store_result(&gMysql);
+                                                uWizLabelLoop=mysql_num_rows(res);
+                                                mysql_free_result(res);
+                                        }
+                                        sprintf(cNewLabel,"%.25s-clone%u",cLabel,uWizLabelSuffix);
+                                        sprintf(cLabel,"%.32s",cNewLabel);
+
+                                        sprintf(cSourceHostname,"%.99s",ForeignKey("tContainer","cHostname",uSource));
+                                        if((cp=strchr(cSourceHostname,'.')))
+                                        {
+                                                sprintf(cHostname,"%.32s.%.64s",cLabel,cp+1);
+                                        }
+                                }
+
                                 uHostnameLen=strlen(cHostname);
                                 if(!strstr(cHostname+(uHostnameLen-strlen(cunxsBindARecordJobZone)-1),cunxsBindARecordJobZone))
-                                        tContainer("<blink>Error:</blink> cHostname must end with cunxsBindARecordJobZone");
+                                                tContainer("<blink>Error:</blink> cHostname must end with cunxsBindARecordJobZone");
+                                if(uSource)
+                                {
+                                        sprintf(gcQuery,"UPDATE tContainer SET cHostname='%s',cLabel='%s'"
+                                                                " WHERE uContainer=%u",cHostname,cLabel,uContainer);
+                                        mysql_query(&gMysql,gcQuery);
+                                        if(mysql_errno(&gMysql))
+                                                htmlPlainTextError(mysql_error(&gMysql));
+                                }
 
                                 guMode=0;
@@ -2894 +2942 @@
                                         if(!cIPOld[0])
                                                 htmlPlainTextError("Unexpected !cIPOld");
-                                        //Note that job is for new node
+
+                                        //Note that these jobs are for new node
                                         //Then this job must run after migration.
-                                        if(IPContainerJob(uTargetDatacenter,uTargetNode,uContainer,uOwner,guLoginClient,cIPOld))
-
+                                        IPContainerJob(uTargetDatacenter,uTargetNode,uContainer,uOwner,guLoginClient,cIPOld);
                                         //Create unxsBind DNS
                                         CreateDNSJob(uWizIPv4,uOwner,NULL,cHostname,uDatacenter,guLoginClient);
+
+                                        //Create change hostname job
+                                        if(uSource)
+                                                HostnameContainerJob(uTargetDatacenter,uTargetNode,uContainer,cPrevHostname);
 
                                         sscanf(ForeignKey("tContainer","uModDate",uContainer),"%lu",&uModDate);
@@ -3981 +4033 @@
                                 {
                                         htmlHealth(uContainer,3);
-                                        printf("<p><input title='Migrate container to another datacenter node'"
-                                        " type=submit class=largeButton"
-                                        " name=gcCommand value='Remote Migration'><br>\n");
                                         if(!strstr(cLabel,"-clone"))
-                                        printf("<input title='Clone a container to this or another hardware node."
+                                        printf("<p><input title='Clone a container to this or another hardware node."
                                         " The clone will be an online container with another IP and hostname."
                                         " It will be kept updated via rsync on a configurable basis.'"
@@ -4033 +4082 @@
                                         " type=submit class=largeButton"
                                         " name=gcCommand value='Migration Wizard'><br>\n");
+                                        printf("<input title='Migrate container to another datacenter node'"
+                                        " type=submit class=largeButton"
+                                        " name=gcCommand value='Remote Migration'><br>\n");
                                         printf("<input title='Change current container name and hostname'"
                                         " type=submit class=largeButton"

trunk/tdatacenterfunc.h

@@ -705 +705 @@
         mysql_free_result(res);
 
+        //4b-. Last 5 min top diff talkers
+        if(uTargetNode)
+                sprintf(gcQuery,"SELECT ABS(CONVERT(t2.cValue,SIGNED)-CONVERT(t1.cValue,SIGNED)),t1.uKey,t1.uKey FROM"
+                        " tProperty AS t1, tProperty AS t2 WHERE"
+                        " t1.uKey IN (SELECT uContainer from tContainer where uStatus=%u AND uDatacenter=%u AND uNode=%u) AND"
+                        " t1.uKey=t2.uKey AND t1.uType=3 AND t1.cName='Venet0.luInDelta' AND"
+                        " t2.uKey=t2.uKey AND t2.uType=3 AND t2.cName='Venet0.luOutDelta'"
+                        " ORDER BY ABS(CONVERT(t2.cValue,SIGNED)-CONVERT(t1.cValue,SIGNED)) DESC LIMIT 10",uACTIVE,uDatacenter,uTargetNode);
+        else
+                sprintf(gcQuery,"SELECT ABS(CONVERT(t2.cValue,SIGNED)-CONVERT(t1.cValue,SIGNED)),t1.uKey,t1.uKey FROM"
+                        " tProperty AS t1, tProperty AS t2 WHERE"
+                        " t1.uKey IN (SELECT uContainer from tContainer where uStatus=%u AND uDatacenter=%u) AND"
+                        " t1.uKey=t2.uKey AND t1.uType=3 AND t1.cName='Venet0.luInDelta' AND"
+                        " t2.uKey=t2.uKey AND t2.uType=3 AND t2.cName='Venet0.luOutDelta'"
+                        " ORDER BY ABS(CONVERT(t2.cValue,SIGNED)-CONVERT(t1.cValue,SIGNED)) DESC LIMIT 10",uACTIVE,uDatacenter);
+        mysql_query(&gMysql,gcQuery);
+        if(mysql_errno(&gMysql))
+        {
+                printf("<p><u>tDatacenterHealth</u><br>\n");
+                printf("5-. %s",mysql_error(&gMysql));
+                return;
+        }
+        res=mysql_store_result(&gMysql);
+        if(mysql_num_rows(res))
+        {       
+                printf("<p><u>Last 5min top diff</u><br>\n");
+
+                while((field=mysql_fetch_row(res)))
+                        printf("<a class=darkLink href=unxsVZ.cgi?gcFunction=tContainer&uContainer=%s>"
+                                "%s %sB/s</a><br>\n",field[1],field[2],field[0]);
+        }
+        mysql_free_result(res);
+
         //4-. Top talkers
         if(uTargetNode)