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

sRPC/client: Properly trim storageRPCPath for actual disk path. (#3749)

Browse Source 
Never print internal RPC endpoint paths.
This commit is contained in:
Harshavardhana 2017-02-15 03:47:47 -08:00 committed by GitHub
parent 13c3b9cbcb
commit fb39c7c26b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import (
"net/rpc" "net/rpc"
"net/url" "net/url"
"path" "path"
"strings"
"github.com/minio/minio/pkg/disk" "github.com/minio/minio/pkg/disk"
) )
@ -132,20 +133,20 @@ func newStorageRPC(ep *url.URL) (StorageAPI, error) {
// Stringer interface compatible representation of network device. // Stringer interface compatible representation of network device.
func (n *networkStorage) String() string { func (n *networkStorage) String() string {
return n.rpcClient.ServerAddr() + ":" + n.rpcClient.ServiceEndpoint() // Remove the storage RPC path prefix, internal paths are meaningless.
serviceEndpoint := strings.TrimPrefix(n.rpcClient.ServiceEndpoint(), storageRPCPath)
return n.rpcClient.ServerAddr() + ":" + serviceEndpoint
} }
// Init - attempts a login to reconnect. // Init - attempts a login to reconnect.
func (n *networkStorage) Init() error { func (n *networkStorage) Init() error {
err := n.rpcClient.Login() return toStorageErr(n.rpcClient.Login())
return toStorageErr(err)
} }
// Closes the underlying RPC connection. // Closes the underlying RPC connection.
func (n *networkStorage) Close() (err error) { func (n *networkStorage) Close() error {
// Close the underlying connection. // Close the underlying connection.
err = n.rpcClient.Close() return toStorageErr(n.rpcClient.Close())
return toStorageErr(err)
} }
// DiskInfo - fetch disk information for a remote disk. // DiskInfo - fetch disk information for a remote disk.