MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 06:05:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes a regression introduced in previous commit.
This commit is contained in:
Harshavardhana 2017-02-18 02:52:11 -08:00 committed by GitHub
parent 50b4e54a75
commit 34d9a6b46a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/namespace-lock.go
View File

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

4
cmd/storage-rpc-client.go
View File

@ -34,7 +34,7 @@ type networkStorage struct {
}
const (
storageRPCPath = minioReservedBucketPath + "/storage"
storageRPCPath = "/storage"
)
// 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.
rpcPath := path.Join(storageRPCPath, getPath(ep))
rpcPath := path.Join(minioReservedBucketPath, storageRPCPath, getPath(ep))
rpcAddr := ep.Host
serverCred := serverConfig.GetCredential()

2
cmd/storage-rpc-server.go
View File

@ -234,7 +234,7 @@ func registerStorageRPCRouters(mux *router.Router, srvCmdConfig serverCmdConfig)
}
// Add minio storage routes.
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
}