Fixed initializing store in ipam (#188)

* fixed initializing store in ipam

Author: tamilmani1989

cni/ipam/plugin/main.go

@@ -26,17 +26,32 @@ func main() {
 		os.Exit(1)
 	}
 
+	if err := ipamPlugin.Plugin.InitializeKeyValueStore(&config); err != nil {
+		fmt.Printf("Failed to initialize key-value store of ipam plugin, err:%v.\n", err)
+		os.Exit(1)
+	}
+
+	defer func() {
+		if errUninit := ipamPlugin.Plugin.UninitializeKeyValueStore(); errUninit != nil {
+			fmt.Printf("Failed to uninitialize key-value store of ipam plugin, err:%v.\n", err)
+		}
+
+		if recover() != nil {
+			os.Exit(1)
+		}
+	}()
+
 	err = ipamPlugin.Start(&config)
 	if err != nil {
 		fmt.Printf("Failed to start IPAM plugin, err:%v.\n", err)
-		os.Exit(1)
+		panic("ipam plugin fatal error")
 	}
 
 	err = ipamPlugin.Execute(cni.PluginApi(ipamPlugin))
 
 	ipamPlugin.Stop()
 
 	if err != nil {
-		os.Exit(1)
+		panic("ipam plugin fatal error")
 	}
 }

cni/network/plugin/main.go

@@ -83,6 +83,12 @@ func main() {
 
 	netPlugin.SetReportManager(reportManager)
 
+	if err = netPlugin.Plugin.InitializeKeyValueStore(&config); err != nil {
+		log.Printf("Failed to initialize key-value store of network plugin, err:%v.\n", err)
+		reportPluginError(reportManager, err)
+		os.Exit(1)
+	}
+
 	defer func() {
 		if errUninit := netPlugin.Plugin.UninitializeKeyValueStore(); errUninit != nil {
 			log.Printf("Failed to uninitialize key-value store of network plugin, err:%v.\n", err)
@@ -93,12 +99,6 @@ func main() {
 		}
 	}()
 
-	if err = netPlugin.Plugin.InitializeKeyValueStore(&config); err != nil {
-		log.Printf("Failed to initialize key-value store of network plugin, err:%v.\n", err)
-		reportPluginError(reportManager, err)
-		panic("network plugin fatal error")
-	}
-
 	if err = netPlugin.Start(&config); err != nil {
 		log.Printf("Failed to start network plugin, err:%v.\n", err)
 		reportPluginError(reportManager, err)

ipam/manager.go

@@ -96,6 +96,7 @@ func (am *addressManager) Uninitialize() {
 func (am *addressManager) restore() error {
 	// Skip if a store is not provided.
 	if am.store == nil {
+		log.Printf("[ipam] ipam store is nil")
 		return nil
 	}
 
@@ -117,6 +118,7 @@ func (am *addressManager) restore() error {
 	err = am.store.Read(storeKey, am)
 	if err != nil {
 		if err == store.ErrKeyNotFound {
+			log.Printf("[ipam] store key not found")
 			return nil
 		} else {
 			log.Printf("[ipam] Failed to restore state, err:%v\n", err)

network/manager.go

@@ -72,6 +72,7 @@ func (nm *networkManager) Uninitialize() {
 func (nm *networkManager) restore() error {
 	// Skip if a store is not provided.
 	if nm.store == nil {
+		log.Printf("[net] network store is nil")
 		return nil
 	}
 
@@ -83,6 +84,7 @@ func (nm *networkManager) restore() error {
 	err := nm.store.Read(storeKey, nm)
 	if err != nil {
 		if err == store.ErrKeyNotFound {
+			log.Printf("[net] network store key not found")
 			// Considered successful.
 			return nil
 		} else {