oyd
/
minio
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpc/client: Add missing rpcTokens for each rpc calls.

Browse Source
master
Harshavardhana 8 years ago
parent 83074ed57e
commit cae5761f16
1 changed files with 19 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 29
      cmd/storage-rpc-client.go

29
cmd/storage-rpc-client.go
Unescape View File

@ -156,7 +156,8 @@ func (n networkStorage) StatVol(volume string) (volInfo VolInfo, err error) {
if n.rpcClient == nil { if n.rpcClient == nil {
return VolInfo{}, errVolumeBusy return VolInfo{}, errVolumeBusy
} }
if err = n.rpcClient.Call("Storage.StatVolHandler", volume, &volInfo); err != nil { args := GenericVolArgs{n.rpcToken, volume}
if err = n.rpcClient.Call("Storage.StatVolHandler", args, &volInfo); err != nil {
return VolInfo{}, toStorageErr(err) return VolInfo{}, toStorageErr(err)
} }
return volInfo, nil return volInfo, nil
@ -168,7 +169,8 @@ func (n networkStorage) DeleteVol(volume string) error {
return errVolumeBusy return errVolumeBusy
} }
reply := GenericReply{} reply := GenericReply{}
if err := n.rpcClient.Call("Storage.DeleteVolHandler", volume, &reply); err != nil { args := GenericVolArgs{n.rpcToken, volume}
if err := n.rpcClient.Call("Storage.DeleteVolHandler", args, &reply); err != nil {
return toStorageErr(err) return toStorageErr(err)
} }
return nil return nil
@ -183,6 +185,7 @@ func (n networkStorage) AppendFile(volume, path string, buffer []byte) (err erro
} }
reply := GenericReply{} reply := GenericReply{}
if err = n.rpcClient.Call("Storage.AppendFileHandler", AppendFileArgs{ if err = n.rpcClient.Call("Storage.AppendFileHandler", AppendFileArgs{
Token: n.rpcToken,
Vol: volume, Vol: volume,
Path: path, Path: path,
Buffer: buffer, Buffer: buffer,
@ -195,8 +198,9 @@ func (n networkStorage) AppendFile(volume, path string, buffer []byte) (err erro
// StatFile - get latest Stat information for a file at path. // StatFile - get latest Stat information for a file at path.
func (n networkStorage) StatFile(volume, path string) (fileInfo FileInfo, err error) { func (n networkStorage) StatFile(volume, path string) (fileInfo FileInfo, err error) {
if err = n.rpcClient.Call("Storage.StatFileHandler", StatFileArgs{ if err = n.rpcClient.Call("Storage.StatFileHandler", StatFileArgs{
Vol: volume, Token: n.rpcToken,
Path: path, Vol: volume,
Path: path,
}, &fileInfo); err != nil { }, &fileInfo); err != nil {
return FileInfo{}, toStorageErr(err) return FileInfo{}, toStorageErr(err)
} }
@ -209,8 +213,9 @@ func (n networkStorage) StatFile(volume, path string) (fileInfo FileInfo, err er
// not use this on large files as it would cause server to crash. // not use this on large files as it would cause server to crash.
func (n networkStorage) ReadAll(volume, path string) (buf []byte, err error) { func (n networkStorage) ReadAll(volume, path string) (buf []byte, err error) {
if err = n.rpcClient.Call("Storage.ReadAllHandler", ReadAllArgs{ if err = n.rpcClient.Call("Storage.ReadAllHandler", ReadAllArgs{
Vol: volume, Token: n.rpcToken,
Path: path, Vol: volume,
Path: path,
}, &buf); err != nil { }, &buf); err != nil {
return nil, toStorageErr(err) return nil, toStorageErr(err)
} }
@ -223,6 +228,7 @@ func (n networkStorage) ReadFile(volume string, path string, offset int64, buffe
return 0, errVolumeBusy return 0, errVolumeBusy
} }
if err = n.rpcClient.Call("Storage.ReadFileHandler", ReadFileArgs{ if err = n.rpcClient.Call("Storage.ReadFileHandler", ReadFileArgs{
Token: n.rpcToken,
Vol: volume, Vol: volume,
Path: path, Path: path,
Offset: offset, Offset: offset,
@ -239,8 +245,9 @@ func (n networkStorage) ListDir(volume, path string) (entries []string, err erro
return nil, errVolumeBusy return nil, errVolumeBusy
} }
if err = n.rpcClient.Call("Storage.ListDirHandler", ListDirArgs{ if err = n.rpcClient.Call("Storage.ListDirHandler", ListDirArgs{
Vol: volume, Token: n.rpcToken,
Path: path, Vol: volume,
Path: path,
}, &entries); err != nil { }, &entries); err != nil {
return nil, toStorageErr(err) return nil, toStorageErr(err)
} }
@ -255,8 +262,9 @@ func (n networkStorage) DeleteFile(volume, path string) (err error) {
} }
reply := GenericReply{} reply := GenericReply{}
if err = n.rpcClient.Call("Storage.DeleteFileHandler", DeleteFileArgs{ if err = n.rpcClient.Call("Storage.DeleteFileHandler", DeleteFileArgs{
Vol: volume, Token: n.rpcToken,
Path: path, Vol: volume,
Path: path,
}, &reply); err != nil { }, &reply); err != nil {
return toStorageErr(err) return toStorageErr(err)
} }
@ -270,6 +278,7 @@ func (n networkStorage) RenameFile(srcVolume, srcPath, dstVolume, dstPath string
} }
reply := GenericReply{} reply := GenericReply{}
if err = n.rpcClient.Call("Storage.RenameFileHandler", RenameFileArgs{ if err = n.rpcClient.Call("Storage.RenameFileHandler", RenameFileArgs{
Token: n.rpcToken,
SrcVol: srcVolume, SrcVol: srcVolume,
SrcPath: srcPath, SrcPath: srcPath,
DstVol: dstVolume, DstVol: dstVolume,

Write Preview
Loading…
Cancel
Save