Make sure client initializes to proper lock RPC path. (#3763)

Fixes a regression introduced in previous commit.
master
Harshavardhana 8 years ago committed by GitHub
parent 50b4e54a75
commit 34d9a6b46a
  1. 2
      cmd/namespace-lock.go
  2. 4
      cmd/storage-rpc-client.go
  3. 2
      cmd/storage-rpc-server.go

@ -51,7 +51,7 @@ func initDsyncNodes(eps []*url.URL) error {
accessKey: cred.AccessKey, accessKey: cred.AccessKey,
secretKey: cred.SecretKey, secretKey: cred.SecretKey,
serverAddr: ep.Host, serverAddr: ep.Host,
serviceEndpoint: pathutil.Join(lockRPCPath, getPath(ep)), serviceEndpoint: pathutil.Join(minioReservedBucketPath, lockRPCPath, getPath(ep)),
secureConn: globalIsSSL, secureConn: globalIsSSL,
serviceName: "Dsync", serviceName: "Dsync",
}) })

@ -34,7 +34,7 @@ type networkStorage struct {
} }
const ( const (
storageRPCPath = minioReservedBucketPath + "/storage" storageRPCPath = "/storage"
) )
// Converts rpc.ServerError to underlying error. This function is // Converts rpc.ServerError to underlying error. This function is
@ -102,7 +102,7 @@ func newStorageRPC(ep *url.URL) (StorageAPI, error) {
} }
// Dial minio rpc storage http path. // Dial minio rpc storage http path.
rpcPath := path.Join(storageRPCPath, getPath(ep)) rpcPath := path.Join(minioReservedBucketPath, storageRPCPath, getPath(ep))
rpcAddr := ep.Host rpcAddr := ep.Host
serverCred := serverConfig.GetCredential() serverCred := serverConfig.GetCredential()

@ -234,7 +234,7 @@ func registerStorageRPCRouters(mux *router.Router, srvCmdConfig serverCmdConfig)
} }
// Add minio storage routes. // Add minio storage routes.
storageRouter := mux.PathPrefix(minioReservedBucketPath).Subrouter() storageRouter := mux.PathPrefix(minioReservedBucketPath).Subrouter()
storageRouter.Path(path.Join("/storage", stServer.path)).Handler(storageRPCServer) storageRouter.Path(path.Join(storageRPCPath, stServer.path)).Handler(storageRPCServer)
} }
return nil return nil
} }

Loading…
Cancel
Save