control: Fix controller CLI handling with distributed server object layer.

Object layer initialization is done lazily fix it.

cmd/controller-handlers.go

@@ -34,7 +34,7 @@ type HealListReply struct {
 
 // ListObjects - list all objects that needs healing.
 func (c *controllerAPIHandlers) ListObjectsHeal(arg *HealListArgs, reply *HealListReply) error {
-	objAPI := c.ObjectAPI
+	objAPI := c.ObjectAPI()
 	if objAPI == nil {
 		return errInvalidArgument
 	}
@@ -61,7 +61,7 @@ type HealObjectReply struct{}
 
 // HealObject - heal the object.
 func (c *controllerAPIHandlers) HealObject(arg *HealObjectArgs, reply *HealObjectReply) error {
-	objAPI := c.ObjectAPI
+	objAPI := c.ObjectAPI()
 	if objAPI == nil {
 		return errInvalidArgument
 	}

cmd/controller-router.go

@@ -38,5 +38,5 @@ func registerControlRPCRouter(mux *router.Router, ctrlHandlers *controllerAPIHan
 
 // Handler for object healing.
 type controllerAPIHandlers struct {
-	ObjectAPI ObjectLayer
+	ObjectAPI func() ObjectLayer
 }

cmd/lock-rpc-server.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package main
+package cmd
 
 import (
 	"fmt"

cmd/net-rpc-client.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package main
+package cmd
 
 import (
 	"net/rpc"

cmd/routers.go

@@ -106,16 +106,23 @@ func configureServerHandler(srvCmdConfig serverCmdConfig) http.Handler {
 		ObjectAPI: newObjectLayerFn,
 	}
 
+	// Initialize Controller.
+	ctrlHandlers := &controllerAPIHandlers{
+		ObjectAPI: newObjectLayerFn,
+	}
+
 	// Initialize router.
 	mux := router.NewRouter()
 
 	// Register all routers.
 	registerStorageRPCRouters(mux, storageRPCs)
+
+	// Initialize distributed NS lock.
 	initDistributedNSLock(mux, srvCmdConfig)
 
 	// FIXME: till net/rpc auth is brought in "minio control" can be enabled only though
 	// this env variable.
-	if os.Getenv("MINIO_CONTROL") != "" {
+	if !strings.EqualFold(os.Getenv("MINIO_CONTROL"), "off") {
 		registerControlRPCRouter(mux, ctrlHandlers)
 	}
 

cmd/storage-rpc-client.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package main
+package cmd
 
 import (
 	"errors"
@@ -88,7 +88,7 @@ func loginRPCClient(rpcClient *RPCClient) (tokenStr string, err error) {
 	}, &reply); err != nil {
 		return "", err
 	}
-	if reply.ServerVersion != minioVersion {
+	if reply.ServerVersion != Version {
 		return "", errors.New("Server version mismatch")
 	}
 	// Reply back server provided token.

cmd/storage-rpc-server-datatypes.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package main
+package cmd
 
 // RPCLoginArgs - login username and password for RPC.
 type RPCLoginArgs struct {

cmd/storage-rpc-server.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package main
+package cmd
 
 import (
 	"bytes"
@@ -73,7 +73,7 @@ func (s *storageServer) LoginHandler(args *RPCLoginArgs, reply *RPCLoginReply) e
 		return err
 	}
 	reply.Token = token
-	reply.ServerVersion = minioVersion
+	reply.ServerVersion = Version
 	return nil
 }
 

cmd/utils_nix_test.go

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package main
+package cmd
 
 import (
 	"net"

cmd/utils_windows_test.go

@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package main
+package cmd
 
 import (
 	"net"