Address CIDs 13799-13810

eucalyptus · May 24, 2016 · 96a31e5 · 96a31e5
1 parent ffc8fc1
commit 96a31e5
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 10 deletions.
diff --git a/net/euca-to-mido.c b/net/euca-to-mido.c
@@ -1599,6 +1599,9 @@ int do_midonet_update_pass2(globalNetworkInfo *gni, mido_config *mido) {
             ret += delete_mido_vpc(mido, vpc);
             // Re-enable nginx
             rc = do_metaproxy_setup(mido);
+            if (rc) {
+                LOGERROR("failed to start metadata proxies\n");
+            }
         } else {
             LOGTRACE("pass2: mido VPC %s in global: Y\n", vpc->name);
         }
@@ -1679,6 +1682,9 @@ int do_midonet_update_pass3_vpcs(globalNetworkInfo *gni, mido_config *mido) {
                 }
                 // Re-enable nginx
                 rc = do_metaproxy_setup(mido);
+                if (rc) {
+                    LOGERROR("failed to setup metadata proxies\n");
+                }
                 continue;
             } else {
                 vpc->population_failed = 0;
@@ -4905,10 +4911,6 @@ int initialize_mido(mido_config *mido, eucanetdConfig *eucanetd_config,
 
     if (!mido || !eucanetd_config ||
             !eucanetd_config->eucahome ||
-            !eucanetd_config->midoeucanetdhost ||
-            !eucanetd_config->midogwhosts ||
-            !eucanetd_config->midopubnw ||
-            !eucanetd_config->midopubgwip ||
             !int_rtnetwork ||
             !int_rtslashnet ||
             !strlen(eucanetd_config->midoeucanetdhost) ||
@@ -6449,7 +6451,7 @@ int create_mido_core(mido_config *mido, mido_core *midocore) {
 
     midonet_api_chain *eucabr_infilter = NULL;
     eucabr_infilter = mido_create_chain(VPCMIDO_TENANT, "eucabr_infilter", &(midocore->midos[CORE_EUCABR_INFILTER]));
-    if (rc) {
+    if (!eucabr_infilter) {
         LOGERROR("cannot create eucabr infilter.\n");
         ret++;
     } else {
@@ -6613,8 +6615,6 @@ int do_midonet_delete_vpc_object(mido_config *mido, char *id, boolean checkonly)
             case TEST:
                 do_midonet_test(mido);
                 break;
-            default:
-                break;
         }
     }
     return (ret);
@@ -7044,7 +7044,21 @@ int do_midonet_list(mido_config *mido) {
             pbuf = &(buf[ulen]);
         }
     }
+
+    char *bgprecovery = NULL;
+    bgprecovery = discover_mido_bgps(mido);
+    if (bgprecovery && strlen(bgprecovery)) {
+        rc = snprintf(pbuf, buflen, "\n\nmido BGP configuration (for manual recovery):\n%s\n", bgprecovery);
+        if (rc > 0) {
+            ulen += rc;
+            buflen -= rc;
+            pbuf = &(buf[ulen]);
+        }
+    }
+    EUCA_FREE(bgprecovery);
+
     printf("%s\n", buf);
+    printf("\n");
 
     EUCA_FREE(buf);
     return (0);

diff --git a/net/euca_gni.c b/net/euca_gni.c
@@ -6890,10 +6890,10 @@ int compare_gni_instance_name(const void *p1, const void *p2) {
     pp2 = (gni_instance **) p2;
     e1 = *pp1;
     e2 = *pp2;
-    if (e1 && e1->name && strlen(e1->name)) {
+    if (e1 && strlen(e1->name)) {
         name1 = e1->name;
     }
-    if (e2 && e2->name && strlen(e2->name)) {
+    if (e2 && strlen(e2->name)) {
         name2 = e2->name;
     }
     if (name1 == name2) {

diff --git a/net/eucanetd_vpc.c b/net/eucanetd_vpc.c
@@ -533,8 +533,15 @@ static int network_driver_handle_signal(globalNetworkInfo *pGni, int signal) {
 
     switch (signal) {
         case SIGUSR1:
+            mido_info_midonetapi();
             mido_info_http_count_total();
             mido_info_midocache();
+            char *bgprecovery = NULL;
+            bgprecovery = discover_mido_bgps(pMidoConfig);
+            if (bgprecovery && strlen(bgprecovery)) {
+                LOGINFO("\nmido BGP configuration (for manual recovery):\n%s\n", bgprecovery);
+            }
+            EUCA_FREE(bgprecovery);
             break;
         case SIGUSR2:
             LOGINFO("Going to invalidate midocache\n");
@@ -620,13 +627,16 @@ static u32 network_driver_system_scrub(globalNetworkInfo *pGni, globalNetworkInf
             eucanetdConfig *configbak = pMidoConfig->config;
             free_mido_config(pMidoConfig);
             pMidoConfig->config = configbak;
+        } else {
+            LOGERROR("failed to (re)initialize config options: VPCMIDO driver not initialized\n");
+            return (EUCANETD_RUN_ERROR_API);
         }
         //rc = initialize_mido(pMidoConfig, config->eucahome, config->flushmode,
         //        config->disable_l2_isolation, config->midoeucanetdhost, config->midogwhosts,
         //        config->midopubnw, config->midopubgwip, "169.254.0.0", "17");
         rc = initialize_mido(pMidoConfig, pMidoConfig->config, "169.254.0.0", "17");
         if (rc) {
-            LOGERROR("failed to (re)initialize config options for VPCMIDO mode are set\n");
+            LOGERROR("failed to (re)initialize config options\n");
             return (EUCANETD_RUN_ERROR_API);
         }
         pGniApplied = NULL;

diff --git a/net/midonet-api.h b/net/midonet-api.h
@@ -383,6 +383,7 @@ int iplist_arr_free(char **iparr, int max_iparr);
 
 int routername_split(char *routername, char **name, int *id);
 
+void mido_info_midonetapi();
 void mido_info_midocache();
 
 void mido_info_http_count();