move filer assign volume grpc errror to response

This commit is contained in:
Chris Lu 2020-02-25 17:15:09 -08:00
parent bc38b72a20
commit 0841bedb15
9 changed files with 139 additions and 113 deletions

View file

@ -180,6 +180,7 @@ message AssignVolumeResponse {
string auth = 5;
string collection = 6;
string replication = 7;
string error = 8;
}
message LookupVolumeRequest {

View file

@ -290,6 +290,9 @@ func (worker *FileCopyWorker) uploadFileAsOne(ctx context.Context, task FileCopy
if assignError != nil {
return fmt.Errorf("assign volume failure %v: %v", request, assignError)
}
if assignResult.Error != "" {
return fmt.Errorf("assign volume failure %v: %v", request, assignResult.Error)
}
return nil
})
if err != nil {
@ -387,6 +390,9 @@ func (worker *FileCopyWorker) uploadFileInChunks(ctx context.Context, task FileC
if assignError != nil {
return fmt.Errorf("assign volume failure %v: %v", request, assignError)
}
if assignResult.Error != "" {
return fmt.Errorf("assign volume failure %v: %v", request, assignResult.Error)
}
return nil
})
if err != nil {

View file

@ -160,6 +160,9 @@ func (pages *ContinuousDirtyPages) saveToStorage(ctx context.Context, reader io.
glog.V(0).Infof("assign volume failure %v: %v", request, err)
return err
}
if resp.Error != "" {
return fmt.Errorf("assign volume failure %v: %v", request, resp.Error)
}
fileId, host, auth = resp.FileId, resp.Url, security.EncodedJwt(resp.Auth)
pages.collection, pages.replication = resp.Collection, resp.Replication

View file

@ -180,6 +180,7 @@ message AssignVolumeResponse {
string auth = 5;
string collection = 6;
string replication = 7;
string error = 8;
}
message LookupVolumeRequest {

View file

@ -751,6 +751,7 @@ type AssignVolumeResponse struct {
Auth string `protobuf:"bytes,5,opt,name=auth" json:"auth,omitempty"`
Collection string `protobuf:"bytes,6,opt,name=collection" json:"collection,omitempty"`
Replication string `protobuf:"bytes,7,opt,name=replication" json:"replication,omitempty"`
Error string `protobuf:"bytes,8,opt,name=error" json:"error,omitempty"`
}
func (m *AssignVolumeResponse) Reset() { *m = AssignVolumeResponse{} }
@ -807,6 +808,13 @@ func (m *AssignVolumeResponse) GetReplication() string {
return ""
}
func (m *AssignVolumeResponse) GetError() string {
if m != nil {
return m.Error
}
return ""
}
type LookupVolumeRequest struct {
VolumeIds []string `protobuf:"bytes,1,rep,name=volume_ids,json=volumeIds" json:"volume_ids,omitempty"`
}
@ -1578,111 +1586,112 @@ var _SeaweedFiler_serviceDesc = grpc.ServiceDesc{
func init() { proto.RegisterFile("filer.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
// 1692 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0xcb, 0x6f, 0xdb, 0xc8,
0x19, 0x37, 0xf5, 0xe6, 0x27, 0x29, 0xb1, 0x47, 0x76, 0xa2, 0xc8, 0x8f, 0x3a, 0x74, 0x93, 0xba,
0x48, 0xe0, 0x1a, 0x6e, 0x0e, 0x49, 0xd3, 0x1e, 0x12, 0x3f, 0x0a, 0xa3, 0xce, 0x03, 0x74, 0x52,
0xa4, 0x28, 0x50, 0x82, 0x26, 0x47, 0xf2, 0xd4, 0x24, 0x47, 0x1d, 0x0e, 0x6d, 0xa7, 0x7f, 0x4a,
0x81, 0x1e, 0xfa, 0x37, 0xf4, 0xba, 0xd8, 0xcb, 0x62, 0x81, 0x3d, 0xec, 0xdf, 0xb2, 0xc7, 0x3d,
0x2f, 0x66, 0x86, 0xa4, 0x86, 0xa2, 0x6c, 0x27, 0xbb, 0xc8, 0x8d, 0xf3, 0xbd, 0xe6, 0x9b, 0xdf,
0xf7, 0x94, 0xa0, 0x3d, 0x24, 0x01, 0x66, 0x5b, 0x63, 0x46, 0x39, 0x45, 0x2d, 0x79, 0x70, 0xc6,
0x27, 0xd6, 0x1b, 0x58, 0x3e, 0xa2, 0xf4, 0x2c, 0x19, 0xef, 0x11, 0x86, 0x3d, 0x4e, 0xd9, 0xc7,
0xfd, 0x88, 0xb3, 0x8f, 0x36, 0xfe, 0x57, 0x82, 0x63, 0x8e, 0x56, 0xc0, 0xf4, 0x33, 0x46, 0xdf,
0x58, 0x37, 0x36, 0x4d, 0x7b, 0x42, 0x40, 0x08, 0x6a, 0x91, 0x1b, 0xe2, 0x7e, 0x45, 0x32, 0xe4,
0xb7, 0xb5, 0x0f, 0x2b, 0xb3, 0x0d, 0xc6, 0x63, 0x1a, 0xc5, 0x18, 0x3d, 0x80, 0x3a, 0x16, 0x04,
0x69, 0xad, 0xbd, 0x73, 0x7b, 0x2b, 0x73, 0x65, 0x4b, 0xc9, 0x29, 0xae, 0xf5, 0xb5, 0x01, 0xe8,
0x88, 0xc4, 0x5c, 0x10, 0x09, 0x8e, 0x3f, 0xcd, 0x9f, 0x3b, 0xd0, 0x18, 0x33, 0x3c, 0x24, 0x97,
0xa9, 0x47, 0xe9, 0x09, 0x3d, 0x86, 0x85, 0x98, 0xbb, 0x8c, 0x1f, 0x30, 0x1a, 0x1e, 0x90, 0x00,
0xbf, 0x16, 0x4e, 0x57, 0xa5, 0x48, 0x99, 0x81, 0xb6, 0x00, 0x91, 0xc8, 0x0b, 0x92, 0x98, 0x9c,
0xe3, 0xe3, 0x8c, 0xdb, 0xaf, 0xad, 0x1b, 0x9b, 0x2d, 0x7b, 0x06, 0x07, 0x2d, 0x42, 0x3d, 0x20,
0x21, 0xe1, 0xfd, 0xfa, 0xba, 0xb1, 0xd9, 0xb5, 0xd5, 0xc1, 0xfa, 0x23, 0xf4, 0x0a, 0xfe, 0x7f,
0xde, 0xf3, 0xff, 0x5b, 0x81, 0xba, 0x24, 0xe4, 0x18, 0x1b, 0x13, 0x8c, 0xd1, 0x7d, 0xe8, 0x90,
0xd8, 0x99, 0x00, 0x51, 0x91, 0xbe, 0xb5, 0x49, 0x9c, 0x63, 0x8e, 0x1e, 0x41, 0xc3, 0x3b, 0x4d,
0xa2, 0xb3, 0xb8, 0x5f, 0x5d, 0xaf, 0x6e, 0xb6, 0x77, 0x7a, 0x93, 0x8b, 0xc4, 0x43, 0x77, 0x05,
0xcf, 0x4e, 0x45, 0xd0, 0x53, 0x00, 0x97, 0x73, 0x46, 0x4e, 0x12, 0x8e, 0x63, 0xf9, 0xd2, 0xf6,
0x4e, 0x5f, 0x53, 0x48, 0x62, 0xfc, 0x22, 0xe7, 0xdb, 0x9a, 0x2c, 0x7a, 0x06, 0x2d, 0x7c, 0xc9,
0x71, 0xe4, 0x63, 0xbf, 0x5f, 0x97, 0x17, 0xad, 0x4e, 0xbd, 0x68, 0x6b, 0x3f, 0xe5, 0xab, 0xf7,
0xe5, 0xe2, 0x83, 0xe7, 0xd0, 0x2d, 0xb0, 0xd0, 0x3c, 0x54, 0xcf, 0x70, 0x16, 0x55, 0xf1, 0x29,
0x90, 0x3d, 0x77, 0x83, 0x44, 0x25, 0x58, 0xc7, 0x56, 0x87, 0x3f, 0x54, 0x9e, 0x1a, 0xd6, 0x1e,
0x98, 0x07, 0x49, 0x10, 0xe4, 0x8a, 0x3e, 0x61, 0x99, 0xa2, 0x4f, 0xd8, 0x04, 0xe5, 0xca, 0xb5,
0x28, 0x7f, 0x65, 0xc0, 0xc2, 0xfe, 0x39, 0x8e, 0xf8, 0x6b, 0xca, 0xc9, 0x90, 0x78, 0x2e, 0x27,
0x34, 0x42, 0x8f, 0xc1, 0xa4, 0x81, 0xef, 0x5c, 0x1b, 0xa6, 0x16, 0x0d, 0x52, 0xaf, 0x1f, 0x83,
0x19, 0xe1, 0x0b, 0xe7, 0xda, 0xeb, 0x5a, 0x11, 0xbe, 0x50, 0xd2, 0x1b, 0xd0, 0xf5, 0x71, 0x80,
0x39, 0x76, 0xf2, 0xe8, 0x88, 0xd0, 0x75, 0x14, 0x71, 0x57, 0x85, 0xe3, 0x21, 0xdc, 0x16, 0x26,
0xc7, 0x2e, 0xc3, 0x11, 0x77, 0xc6, 0x2e, 0x3f, 0x95, 0x31, 0x31, 0xed, 0x6e, 0x84, 0x2f, 0xde,
0x4a, 0xea, 0x5b, 0x97, 0x9f, 0x5a, 0x3f, 0x1a, 0x60, 0xe6, 0xc1, 0x44, 0x77, 0xa1, 0x29, 0xae,
0x75, 0x88, 0x9f, 0x22, 0xd1, 0x10, 0xc7, 0x43, 0x5f, 0x54, 0x05, 0x1d, 0x0e, 0x63, 0xcc, 0xa5,
0x7b, 0x55, 0x3b, 0x3d, 0x89, 0xcc, 0x8a, 0xc9, 0xbf, 0x55, 0x21, 0xd4, 0x6c, 0xf9, 0x2d, 0x10,
0x0f, 0x39, 0x09, 0xb1, 0xbc, 0xb0, 0x6a, 0xab, 0x03, 0xea, 0x41, 0x1d, 0x3b, 0xdc, 0x1d, 0xc9,
0x0c, 0x37, 0xed, 0x1a, 0x7e, 0xe7, 0x8e, 0xd0, 0xaf, 0xe1, 0x56, 0x4c, 0x13, 0xe6, 0x61, 0x27,
0xbb, 0xb6, 0x21, 0xb9, 0x1d, 0x45, 0x3d, 0x50, 0x97, 0x5b, 0x50, 0x1d, 0x12, 0xbf, 0xdf, 0x94,
0xc0, 0xcc, 0x17, 0x93, 0xf0, 0xd0, 0xb7, 0x05, 0x13, 0xfd, 0x0e, 0x20, 0xb7, 0xe4, 0xf7, 0x5b,
0x57, 0x88, 0x9a, 0x99, 0x5d, 0xdf, 0xfa, 0x00, 0x8d, 0xd4, 0xfc, 0x32, 0x98, 0xe7, 0x34, 0x48,
0xc2, 0xfc, 0xd9, 0x5d, 0xbb, 0xa5, 0x08, 0x87, 0x3e, 0xba, 0x07, 0xb2, 0xcf, 0x39, 0x22, 0xab,
0x2a, 0xf2, 0x91, 0x12, 0xa1, 0xbf, 0x60, 0xd9, 0x29, 0x3c, 0x4a, 0xcf, 0x88, 0x7a, 0x7d, 0xd3,
0x4e, 0x4f, 0xd6, 0x0f, 0x15, 0xb8, 0x55, 0x4c, 0x77, 0x71, 0x85, 0xb4, 0x22, 0xb1, 0x32, 0xa4,
0x19, 0x69, 0xf6, 0xb8, 0x80, 0x57, 0x45, 0xc7, 0x2b, 0x53, 0x09, 0xa9, 0xaf, 0x2e, 0xe8, 0x2a,
0x95, 0x57, 0xd4, 0xc7, 0x22, 0x5b, 0x13, 0xe2, 0x4b, 0x80, 0xbb, 0xb6, 0xf8, 0x14, 0x94, 0x11,
0xf1, 0xd3, 0xf6, 0x21, 0x3e, 0xa5, 0x7b, 0x4c, 0xda, 0x6d, 0xa8, 0x90, 0xa9, 0x93, 0x08, 0x59,
0x28, 0xa8, 0x4d, 0x15, 0x07, 0xf1, 0x8d, 0xd6, 0xa1, 0xcd, 0xf0, 0x38, 0x48, 0xb3, 0x57, 0xc2,
0x67, 0xda, 0x3a, 0x09, 0xad, 0x01, 0x78, 0x34, 0x08, 0xb0, 0x27, 0x05, 0x4c, 0x29, 0xa0, 0x51,
0x44, 0xe6, 0x70, 0x1e, 0x38, 0x31, 0xf6, 0xfa, 0xb0, 0x6e, 0x6c, 0xd6, 0xed, 0x06, 0xe7, 0xc1,
0x31, 0xf6, 0xc4, 0x3b, 0x92, 0x18, 0x33, 0x47, 0x36, 0xa0, 0xb6, 0xd4, 0x6b, 0x09, 0x82, 0x6c,
0x93, 0xab, 0x00, 0x23, 0x46, 0x93, 0xb1, 0xe2, 0x76, 0xd6, 0xab, 0xa2, 0x17, 0x4b, 0x8a, 0x64,
0x3f, 0x80, 0x5b, 0xf1, 0xc7, 0x30, 0x20, 0xd1, 0x99, 0xc3, 0x5d, 0x36, 0xc2, 0xbc, 0xdf, 0x55,
0x39, 0x9c, 0x52, 0xdf, 0x49, 0xa2, 0x35, 0x06, 0xb4, 0xcb, 0xb0, 0xcb, 0xf1, 0x67, 0x8c, 0x9d,
0x4f, 0xab, 0x6e, 0xb4, 0x04, 0x0d, 0xea, 0xe0, 0x4b, 0x2f, 0x48, 0x8b, 0xac, 0x4e, 0xf7, 0x2f,
0xbd, 0xc0, 0x7a, 0x04, 0xbd, 0xc2, 0x8d, 0x69, 0x63, 0x5e, 0x84, 0x3a, 0x66, 0x8c, 0x66, 0x6d,
0x44, 0x1d, 0xac, 0xbf, 0x01, 0x7a, 0x3f, 0xf6, 0xbf, 0x84, 0x7b, 0xd6, 0x12, 0xf4, 0x0a, 0xa6,
0x95, 0x1f, 0xd6, 0xb7, 0x06, 0xa0, 0x3d, 0xd9, 0x0d, 0x7e, 0xd9, 0x20, 0x16, 0xf5, 0x29, 0x86,
0x84, 0xea, 0x36, 0xbe, 0xcb, 0xdd, 0x74, 0x84, 0x75, 0x48, 0xac, 0xec, 0xef, 0xb9, 0xdc, 0x4d,
0x47, 0x09, 0xc3, 0x5e, 0xc2, 0xc4, 0x54, 0x93, 0x49, 0x28, 0x47, 0x89, 0x9d, 0x91, 0xd0, 0x13,
0xb8, 0x43, 0x46, 0x11, 0x65, 0x78, 0x22, 0xe6, 0x28, 0xa8, 0x1a, 0x52, 0x78, 0x51, 0x71, 0x73,
0x85, 0x7d, 0x89, 0xdc, 0x23, 0xe8, 0x15, 0x9e, 0x71, 0x2d, 0xcc, 0xff, 0x31, 0xa0, 0xff, 0x82,
0xd3, 0x90, 0x78, 0x36, 0x16, 0xce, 0x17, 0x9e, 0xbe, 0x01, 0x5d, 0xd1, 0x8f, 0xa7, 0x9f, 0xdf,
0xa1, 0x81, 0x3f, 0x99, 0x77, 0xf7, 0x40, 0xb4, 0x64, 0x47, 0x43, 0xa1, 0x49, 0x03, 0x5f, 0x66,
0xe2, 0x06, 0x88, 0xbe, 0xa9, 0xe9, 0xab, 0xc9, 0xdf, 0x89, 0xf0, 0x45, 0x41, 0x5f, 0x08, 0x49,
0x7d, 0xd5, 0x6c, 0x9b, 0x11, 0xbe, 0x10, 0xfa, 0xd6, 0x32, 0xdc, 0x9b, 0xe1, 0x5b, 0x1a, 0xae,
0xef, 0x0c, 0xe8, 0xbd, 0x88, 0x63, 0x32, 0x8a, 0xfe, 0x2a, 0xdb, 0x4e, 0xe6, 0xf4, 0x22, 0xd4,
0x3d, 0x9a, 0x44, 0x5c, 0x3a, 0x5b, 0xb7, 0xd5, 0x61, 0xaa, 0x12, 0x2b, 0xa5, 0x4a, 0x9c, 0xaa,
0xe5, 0x6a, 0xb9, 0x96, 0xb5, 0x5a, 0xad, 0x15, 0x6a, 0xf5, 0x57, 0xd0, 0x16, 0x41, 0x76, 0x3c,
0x1c, 0x71, 0xcc, 0xd2, 0x4e, 0x0d, 0x82, 0xb4, 0x2b, 0x29, 0x42, 0x40, 0x9f, 0x28, 0xaa, 0x59,
0xc3, 0x78, 0x32, 0x4e, 0xbe, 0x37, 0x60, 0xb1, 0xf8, 0x94, 0x34, 0x66, 0x57, 0x4e, 0x16, 0xd1,
0xca, 0x58, 0x90, 0xbe, 0x43, 0x7c, 0x8a, 0xa6, 0x30, 0x4e, 0x4e, 0x02, 0xe2, 0x39, 0x82, 0xa1,
0xfc, 0x37, 0x15, 0xe5, 0x3d, 0x0b, 0x26, 0xa8, 0xd4, 0x74, 0x54, 0x10, 0xd4, 0xdc, 0x84, 0x9f,
0x66, 0xd3, 0x45, 0x7c, 0x4f, 0x21, 0xd5, 0xb8, 0x09, 0xa9, 0x66, 0x09, 0x29, 0xeb, 0x09, 0xf4,
0xd4, 0x22, 0x5a, 0x0c, 0xcc, 0x2a, 0x40, 0x3e, 0x31, 0xe2, 0xbe, 0xa1, 0xda, 0x56, 0x36, 0x32,
0x62, 0xeb, 0x4f, 0x60, 0x1e, 0x51, 0x65, 0x21, 0x46, 0xdb, 0x60, 0x06, 0xd9, 0x41, 0x8a, 0xb6,
0x77, 0xd0, 0xa4, 0x9a, 0x33, 0x39, 0x7b, 0x22, 0x64, 0x3d, 0x87, 0x56, 0x46, 0xce, 0xd0, 0x31,
0xae, 0x42, 0xa7, 0x32, 0x85, 0x8e, 0xf5, 0x8d, 0x01, 0x8b, 0x45, 0x97, 0xd3, 0x00, 0xbc, 0x87,
0x6e, 0x7e, 0x85, 0x13, 0xba, 0xe3, 0xd4, 0x97, 0x6d, 0xdd, 0x97, 0xb2, 0x5a, 0xee, 0x60, 0xfc,
0xca, 0x1d, 0xab, 0xac, 0xed, 0x04, 0x1a, 0x69, 0xf0, 0x0e, 0x16, 0x4a, 0x22, 0x33, 0xb6, 0xb0,
0xdf, 0xea, 0x5b, 0x58, 0x61, 0x93, 0xcc, 0xb5, 0xf5, 0xd5, 0xec, 0x19, 0xdc, 0x55, 0x85, 0xbf,
0x9b, 0x47, 0x2b, 0xc3, 0xbe, 0x18, 0x54, 0x63, 0x3a, 0xa8, 0xd6, 0x00, 0xfa, 0x65, 0xd5, 0xb4,
0xd0, 0x46, 0xb0, 0x70, 0xcc, 0x5d, 0x4e, 0x62, 0x4e, 0xbc, 0xfc, 0xe7, 0xc0, 0x54, 0x16, 0x18,
0x37, 0xcd, 0xbe, 0x72, 0xc5, 0xcd, 0x43, 0x95, 0xf3, 0x2c, 0x53, 0xc5, 0xa7, 0x88, 0x02, 0xd2,
0x6f, 0x4a, 0x63, 0xf0, 0x05, 0xae, 0x12, 0xf9, 0xc0, 0x29, 0x77, 0x03, 0xb5, 0x5b, 0xd4, 0xe4,
0x6e, 0x61, 0x4a, 0x8a, 0x5c, 0x2e, 0xd4, 0xf8, 0xf5, 0x15, 0xb7, 0xae, 0x36, 0x0f, 0x41, 0x90,
0xcc, 0x55, 0x00, 0x59, 0x94, 0xaa, 0x9e, 0x1a, 0x4a, 0x57, 0x50, 0x76, 0x05, 0xc1, 0x5a, 0x83,
0x95, 0x3f, 0x63, 0x2e, 0xb6, 0x24, 0xb6, 0x4b, 0xa3, 0x21, 0x19, 0x25, 0xcc, 0xd5, 0x42, 0x61,
0xfd, 0xdf, 0x80, 0xd5, 0x2b, 0x04, 0xd2, 0x07, 0xf7, 0xa1, 0x19, 0xba, 0x31, 0xc7, 0x2c, 0xab,
0x92, 0xec, 0x38, 0x0d, 0x45, 0xe5, 0x26, 0x28, 0xaa, 0x25, 0x28, 0x96, 0xa0, 0x11, 0xba, 0x97,
0x4e, 0x78, 0x92, 0xae, 0x41, 0xf5, 0xd0, 0xbd, 0x7c, 0x75, 0x22, 0x7b, 0x18, 0x61, 0xce, 0x49,
0xe2, 0x9d, 0x61, 0x1e, 0xe7, 0x3d, 0x8c, 0xb0, 0x97, 0x8a, 0xb2, 0xf3, 0xbf, 0x16, 0x74, 0x8e,
0xb1, 0x7b, 0x81, 0xb1, 0x2f, 0x3d, 0x47, 0xa3, 0xac, 0x62, 0x8a, 0xbf, 0x36, 0xd1, 0x83, 0xe9,
0xd2, 0x98, 0xf9, 0xf3, 0x76, 0xf0, 0xf0, 0x26, 0xb1, 0x34, 0xf9, 0xe6, 0xd0, 0x6b, 0x68, 0x6b,
0x3f, 0xe7, 0xd0, 0x8a, 0xa6, 0x58, 0xfa, 0x95, 0x3a, 0x58, 0xbd, 0x82, 0x9b, 0x59, 0xdb, 0x36,
0xd0, 0x11, 0xb4, 0xb5, 0x2d, 0x44, 0xb7, 0x57, 0x5e, 0x87, 0x74, 0x7b, 0x33, 0x56, 0x17, 0x6b,
0x4e, 0x58, 0xd3, 0x76, 0x09, 0xdd, 0x5a, 0x79, 0x7b, 0xd1, 0xad, 0xcd, 0x5a, 0x40, 0xa4, 0x35,
0x6d, 0x74, 0xeb, 0xd6, 0xca, 0x8b, 0x89, 0x6e, 0x6d, 0xc6, 0xbc, 0xb7, 0xe6, 0xd0, 0x07, 0xe8,
0x1d, 0x73, 0x86, 0xdd, 0x70, 0xc2, 0x9e, 0x42, 0xf0, 0x67, 0x58, 0xdd, 0x34, 0xb6, 0x0d, 0xf4,
0x0f, 0x58, 0x28, 0x0d, 0x66, 0x64, 0x4d, 0x34, 0xaf, 0xda, 0x28, 0x06, 0x1b, 0xd7, 0xca, 0xe4,
0x9e, 0xbf, 0x81, 0x8e, 0x3e, 0x0f, 0x91, 0xe6, 0xd4, 0x8c, 0x91, 0x3f, 0x58, 0xbb, 0x8a, 0xad,
0x1b, 0xd4, 0x1b, 0xb5, 0x6e, 0x70, 0xc6, 0xa8, 0xd2, 0x0d, 0xce, 0xea, 0xef, 0xd6, 0x1c, 0xfa,
0x3b, 0xcc, 0x4f, 0x37, 0x4c, 0x74, 0x7f, 0x1a, 0xba, 0x52, 0x1f, 0x1e, 0x58, 0xd7, 0x89, 0xe4,
0xc6, 0x0f, 0x01, 0x26, 0x7d, 0x10, 0x2d, 0x4f, 0x74, 0x4a, 0x7d, 0x78, 0xb0, 0x32, 0x9b, 0x99,
0x9b, 0xfa, 0x27, 0x2c, 0xcd, 0x6c, 0x36, 0x48, 0x2b, 0xc0, 0xeb, 0xda, 0xd5, 0xe0, 0x37, 0x37,
0xca, 0x65, 0x77, 0xbd, 0x5c, 0x83, 0xf9, 0x58, 0xb5, 0x88, 0x61, 0xbc, 0xe5, 0x05, 0x04, 0x47,
0xfc, 0x25, 0x48, 0x8d, 0xb7, 0x8c, 0x72, 0x7a, 0xd2, 0x90, 0x7f, 0x81, 0xfd, 0xfe, 0xa7, 0x00,
0x00, 0x00, 0xff, 0xff, 0x84, 0x9c, 0x05, 0x4d, 0x11, 0x13, 0x00, 0x00,
// 1697 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0xdb, 0x6e, 0xdb, 0xc8,
0x19, 0x36, 0x75, 0xe6, 0x2f, 0x29, 0xb1, 0x47, 0x76, 0xa2, 0xc8, 0x87, 0x3a, 0x74, 0x93, 0xba,
0x48, 0xe0, 0x1a, 0x6e, 0x2e, 0x92, 0xa6, 0xbd, 0x48, 0x7c, 0x28, 0x8c, 0x3a, 0x07, 0xd0, 0x49,
0x91, 0xa2, 0x40, 0x09, 0x9a, 0x1c, 0xc9, 0x53, 0x93, 0x1c, 0x75, 0x38, 0xb4, 0x9d, 0x3e, 0x4a,
0x81, 0x5e, 0xf4, 0x19, 0x7a, 0xbb, 0xd8, 0x9b, 0xc5, 0x02, 0xfb, 0x1c, 0xfb, 0x00, 0x7b, 0xb9,
0xd7, 0x8b, 0x99, 0x21, 0xa9, 0xa1, 0x28, 0xdb, 0xc9, 0x2e, 0x72, 0xc7, 0xf9, 0x4f, 0xf3, 0xcf,
0xf7, 0x1f, 0x25, 0x68, 0x0f, 0x49, 0x80, 0xd9, 0xd6, 0x98, 0x51, 0x4e, 0x51, 0x4b, 0x1e, 0x9c,
0xf1, 0x89, 0xf5, 0x06, 0x96, 0x8f, 0x28, 0x3d, 0x4b, 0xc6, 0x7b, 0x84, 0x61, 0x8f, 0x53, 0xf6,
0x71, 0x3f, 0xe2, 0xec, 0xa3, 0x8d, 0xff, 0x95, 0xe0, 0x98, 0xa3, 0x15, 0x30, 0xfd, 0x8c, 0xd1,
0x37, 0xd6, 0x8d, 0x4d, 0xd3, 0x9e, 0x10, 0x10, 0x82, 0x5a, 0xe4, 0x86, 0xb8, 0x5f, 0x91, 0x0c,
0xf9, 0x6d, 0xed, 0xc3, 0xca, 0x6c, 0x83, 0xf1, 0x98, 0x46, 0x31, 0x46, 0x0f, 0xa0, 0x8e, 0x05,
0x41, 0x5a, 0x6b, 0xef, 0xdc, 0xde, 0xca, 0x5c, 0xd9, 0x52, 0x72, 0x8a, 0x6b, 0x7d, 0x6d, 0x00,
0x3a, 0x22, 0x31, 0x17, 0x44, 0x82, 0xe3, 0x4f, 0xf3, 0xe7, 0x0e, 0x34, 0xc6, 0x0c, 0x0f, 0xc9,
0x65, 0xea, 0x51, 0x7a, 0x42, 0x8f, 0x61, 0x21, 0xe6, 0x2e, 0xe3, 0x07, 0x8c, 0x86, 0x07, 0x24,
0xc0, 0xaf, 0x85, 0xd3, 0x55, 0x29, 0x52, 0x66, 0xa0, 0x2d, 0x40, 0x24, 0xf2, 0x82, 0x24, 0x26,
0xe7, 0xf8, 0x38, 0xe3, 0xf6, 0x6b, 0xeb, 0xc6, 0x66, 0xcb, 0x9e, 0xc1, 0x41, 0x8b, 0x50, 0x0f,
0x48, 0x48, 0x78, 0xbf, 0xbe, 0x6e, 0x6c, 0x76, 0x6d, 0x75, 0xb0, 0xfe, 0x08, 0xbd, 0x82, 0xff,
0x9f, 0xf7, 0xfc, 0xff, 0x56, 0xa0, 0x2e, 0x09, 0x39, 0xc6, 0xc6, 0x04, 0x63, 0x74, 0x1f, 0x3a,
0x24, 0x76, 0x26, 0x40, 0x54, 0xa4, 0x6f, 0x6d, 0x12, 0xe7, 0x98, 0xa3, 0x47, 0xd0, 0xf0, 0x4e,
0x93, 0xe8, 0x2c, 0xee, 0x57, 0xd7, 0xab, 0x9b, 0xed, 0x9d, 0xde, 0xe4, 0x22, 0xf1, 0xd0, 0x5d,
0xc1, 0xb3, 0x53, 0x11, 0xf4, 0x14, 0xc0, 0xe5, 0x9c, 0x91, 0x93, 0x84, 0xe3, 0x58, 0xbe, 0xb4,
0xbd, 0xd3, 0xd7, 0x14, 0x92, 0x18, 0xbf, 0xc8, 0xf9, 0xb6, 0x26, 0x8b, 0x9e, 0x41, 0x0b, 0x5f,
0x72, 0x1c, 0xf9, 0xd8, 0xef, 0xd7, 0xe5, 0x45, 0xab, 0x53, 0x2f, 0xda, 0xda, 0x4f, 0xf9, 0xea,
0x7d, 0xb9, 0xf8, 0xe0, 0x39, 0x74, 0x0b, 0x2c, 0x34, 0x0f, 0xd5, 0x33, 0x9c, 0x45, 0x55, 0x7c,
0x0a, 0x64, 0xcf, 0xdd, 0x20, 0x51, 0x09, 0xd6, 0xb1, 0xd5, 0xe1, 0x0f, 0x95, 0xa7, 0x86, 0xb5,
0x07, 0xe6, 0x41, 0x12, 0x04, 0xb9, 0xa2, 0x4f, 0x58, 0xa6, 0xe8, 0x13, 0x36, 0x41, 0xb9, 0x72,
0x2d, 0xca, 0x5f, 0x19, 0xb0, 0xb0, 0x7f, 0x8e, 0x23, 0xfe, 0x9a, 0x72, 0x32, 0x24, 0x9e, 0xcb,
0x09, 0x8d, 0xd0, 0x63, 0x30, 0x69, 0xe0, 0x3b, 0xd7, 0x86, 0xa9, 0x45, 0x83, 0xd4, 0xeb, 0xc7,
0x60, 0x46, 0xf8, 0xc2, 0xb9, 0xf6, 0xba, 0x56, 0x84, 0x2f, 0x94, 0xf4, 0x06, 0x74, 0x7d, 0x1c,
0x60, 0x8e, 0x9d, 0x3c, 0x3a, 0x22, 0x74, 0x1d, 0x45, 0xdc, 0x55, 0xe1, 0x78, 0x08, 0xb7, 0x85,
0xc9, 0xb1, 0xcb, 0x70, 0xc4, 0x9d, 0xb1, 0xcb, 0x4f, 0x65, 0x4c, 0x4c, 0xbb, 0x1b, 0xe1, 0x8b,
0xb7, 0x92, 0xfa, 0xd6, 0xe5, 0xa7, 0xd6, 0x8f, 0x06, 0x98, 0x79, 0x30, 0xd1, 0x5d, 0x68, 0x8a,
0x6b, 0x1d, 0xe2, 0xa7, 0x48, 0x34, 0xc4, 0xf1, 0xd0, 0x17, 0x55, 0x41, 0x87, 0xc3, 0x18, 0x73,
0xe9, 0x5e, 0xd5, 0x4e, 0x4f, 0x22, 0xb3, 0x62, 0xf2, 0x6f, 0x55, 0x08, 0x35, 0x5b, 0x7e, 0x0b,
0xc4, 0x43, 0x4e, 0x42, 0x2c, 0x2f, 0xac, 0xda, 0xea, 0x80, 0x7a, 0x50, 0xc7, 0x0e, 0x77, 0x47,
0x32, 0xc3, 0x4d, 0xbb, 0x86, 0xdf, 0xb9, 0x23, 0xf4, 0x6b, 0xb8, 0x15, 0xd3, 0x84, 0x79, 0xd8,
0xc9, 0xae, 0x6d, 0x48, 0x6e, 0x47, 0x51, 0x0f, 0xd4, 0xe5, 0x16, 0x54, 0x87, 0xc4, 0xef, 0x37,
0x25, 0x30, 0xf3, 0xc5, 0x24, 0x3c, 0xf4, 0x6d, 0xc1, 0x44, 0xbf, 0x03, 0xc8, 0x2d, 0xf9, 0xfd,
0xd6, 0x15, 0xa2, 0x66, 0x66, 0xd7, 0xb7, 0x3e, 0x40, 0x23, 0x35, 0xbf, 0x0c, 0xe6, 0x39, 0x0d,
0x92, 0x30, 0x7f, 0x76, 0xd7, 0x6e, 0x29, 0xc2, 0xa1, 0x8f, 0xee, 0x81, 0xec, 0x73, 0x8e, 0xc8,
0xaa, 0x8a, 0x7c, 0xa4, 0x44, 0xe8, 0x2f, 0x58, 0x76, 0x0a, 0x8f, 0xd2, 0x33, 0xa2, 0x5e, 0xdf,
0xb4, 0xd3, 0x93, 0xf5, 0x43, 0x05, 0x6e, 0x15, 0xd3, 0x5d, 0x5c, 0x21, 0xad, 0x48, 0xac, 0x0c,
0x69, 0x46, 0x9a, 0x3d, 0x2e, 0xe0, 0x55, 0xd1, 0xf1, 0xca, 0x54, 0x42, 0xea, 0xab, 0x0b, 0xba,
0x4a, 0xe5, 0x15, 0xf5, 0xb1, 0xc8, 0xd6, 0x84, 0xf8, 0x12, 0xe0, 0xae, 0x2d, 0x3e, 0x05, 0x65,
0x44, 0xfc, 0xb4, 0x7d, 0x88, 0x4f, 0xe9, 0x1e, 0x93, 0x76, 0x1b, 0x2a, 0x64, 0xea, 0x24, 0x42,
0x16, 0x0a, 0x6a, 0x53, 0xc5, 0x41, 0x7c, 0xa3, 0x75, 0x68, 0x33, 0x3c, 0x0e, 0xd2, 0xec, 0x95,
0xf0, 0x99, 0xb6, 0x4e, 0x42, 0x6b, 0x00, 0x1e, 0x0d, 0x02, 0xec, 0x49, 0x01, 0x53, 0x0a, 0x68,
0x14, 0x91, 0x39, 0x9c, 0x07, 0x4e, 0x8c, 0xbd, 0x3e, 0xac, 0x1b, 0x9b, 0x75, 0xbb, 0xc1, 0x79,
0x70, 0x8c, 0x3d, 0xf1, 0x8e, 0x24, 0xc6, 0xcc, 0x91, 0x0d, 0xa8, 0x2d, 0xf5, 0x5a, 0x82, 0x20,
0xdb, 0xe4, 0x2a, 0xc0, 0x88, 0xd1, 0x64, 0xac, 0xb8, 0x9d, 0xf5, 0xaa, 0xe8, 0xc5, 0x92, 0x22,
0xd9, 0x0f, 0xe0, 0x56, 0xfc, 0x31, 0x0c, 0x48, 0x74, 0xe6, 0x70, 0x97, 0x8d, 0x30, 0xef, 0x77,
0x55, 0x0e, 0xa7, 0xd4, 0x77, 0x92, 0x68, 0x8d, 0x01, 0xed, 0x32, 0xec, 0x72, 0xfc, 0x19, 0x63,
0xe7, 0xd3, 0xaa, 0x1b, 0x2d, 0x41, 0x83, 0x3a, 0xf8, 0xd2, 0x0b, 0xd2, 0x22, 0xab, 0xd3, 0xfd,
0x4b, 0x2f, 0xb0, 0x1e, 0x41, 0xaf, 0x70, 0x63, 0xda, 0x98, 0x17, 0xa1, 0x8e, 0x19, 0xa3, 0x59,
0x1b, 0x51, 0x07, 0xeb, 0x6f, 0x80, 0xde, 0x8f, 0xfd, 0x2f, 0xe1, 0x9e, 0xb5, 0x04, 0xbd, 0x82,
0x69, 0xe5, 0x87, 0xf5, 0xad, 0x01, 0x68, 0x4f, 0x76, 0x83, 0x5f, 0x36, 0x88, 0x45, 0x7d, 0x8a,
0x21, 0xa1, 0xba, 0x8d, 0xef, 0x72, 0x37, 0x1d, 0x61, 0x1d, 0x12, 0x2b, 0xfb, 0x7b, 0x2e, 0x77,
0xd3, 0x51, 0xc2, 0xb0, 0x97, 0x30, 0x31, 0xd5, 0x64, 0x12, 0xca, 0x51, 0x62, 0x67, 0x24, 0xf4,
0x04, 0xee, 0x90, 0x51, 0x44, 0x19, 0x9e, 0x88, 0x39, 0x0a, 0xaa, 0x86, 0x14, 0x5e, 0x54, 0xdc,
0x5c, 0x61, 0x5f, 0x22, 0xf7, 0x08, 0x7a, 0x85, 0x67, 0x5c, 0x0b, 0xf3, 0x7f, 0x0c, 0xe8, 0xbf,
0xe0, 0x34, 0x24, 0x9e, 0x8d, 0x85, 0xf3, 0x85, 0xa7, 0x6f, 0x40, 0x57, 0xf4, 0xe3, 0xe9, 0xe7,
0x77, 0x68, 0xe0, 0x4f, 0xe6, 0xdd, 0x3d, 0x10, 0x2d, 0xd9, 0xd1, 0x50, 0x68, 0xd2, 0xc0, 0x97,
0x99, 0xb8, 0x01, 0xa2, 0x6f, 0x6a, 0xfa, 0x6a, 0xf2, 0x77, 0x22, 0x7c, 0x51, 0xd0, 0x17, 0x42,
0x52, 0x5f, 0x35, 0xdb, 0x66, 0x84, 0x2f, 0x84, 0xbe, 0xb5, 0x0c, 0xf7, 0x66, 0xf8, 0x96, 0x86,
0xeb, 0x3b, 0x03, 0x7a, 0x2f, 0xe2, 0x98, 0x8c, 0xa2, 0xbf, 0xca, 0xb6, 0x93, 0x39, 0xbd, 0x08,
0x75, 0x8f, 0x26, 0x11, 0x97, 0xce, 0xd6, 0x6d, 0x75, 0x98, 0xaa, 0xc4, 0x4a, 0xa9, 0x12, 0xa7,
0x6a, 0xb9, 0x5a, 0xae, 0x65, 0xad, 0x56, 0x6b, 0x85, 0x5a, 0xfd, 0x15, 0xb4, 0x45, 0x90, 0x1d,
0x0f, 0x47, 0x1c, 0xb3, 0xb4, 0x53, 0x83, 0x20, 0xed, 0x4a, 0x8a, 0x10, 0xd0, 0x27, 0x8a, 0x6a,
0xd6, 0x30, 0x9e, 0x8c, 0x93, 0xef, 0x0d, 0x58, 0x2c, 0x3e, 0x25, 0x8d, 0xd9, 0x95, 0x93, 0x45,
0xb4, 0x32, 0x16, 0xa4, 0xef, 0x10, 0x9f, 0xa2, 0x29, 0x8c, 0x93, 0x93, 0x80, 0x78, 0x8e, 0x60,
0x28, 0xff, 0x4d, 0x45, 0x79, 0xcf, 0x82, 0x09, 0x2a, 0x35, 0x1d, 0x15, 0x04, 0x35, 0x37, 0xe1,
0xa7, 0xd9, 0x74, 0x11, 0xdf, 0x53, 0x48, 0x35, 0x6e, 0x42, 0xaa, 0x59, 0x46, 0x2a, 0xcf, 0xb4,
0x96, 0x9e, 0x69, 0x4f, 0xa0, 0xa7, 0xd6, 0xd3, 0x62, 0xb8, 0x56, 0x01, 0xf2, 0x39, 0x12, 0xf7,
0x0d, 0xd5, 0xcc, 0xb2, 0x41, 0x12, 0x5b, 0x7f, 0x02, 0xf3, 0x88, 0x2a, 0xbb, 0x31, 0xda, 0x06,
0x33, 0xc8, 0x0e, 0x52, 0xb4, 0xbd, 0x83, 0x26, 0x35, 0x9e, 0xc9, 0xd9, 0x13, 0x21, 0xeb, 0x39,
0xb4, 0x32, 0x72, 0x86, 0x99, 0x71, 0x15, 0x66, 0x95, 0x29, 0xcc, 0xac, 0x6f, 0x0c, 0x58, 0x2c,
0xba, 0x9c, 0x86, 0xe5, 0x3d, 0x74, 0xf3, 0x2b, 0x9c, 0xd0, 0x1d, 0xa7, 0xbe, 0x6c, 0xeb, 0xbe,
0x94, 0xd5, 0x72, 0x07, 0xe3, 0x57, 0xee, 0x58, 0xe5, 0x72, 0x27, 0xd0, 0x48, 0x83, 0x77, 0xb0,
0x50, 0x12, 0x99, 0xb1, 0x9b, 0xfd, 0x56, 0xdf, 0xcd, 0x0a, 0xfb, 0x65, 0xae, 0xad, 0x2f, 0x6c,
0xcf, 0xe0, 0xae, 0x6a, 0x07, 0xbb, 0x79, 0x0c, 0x33, 0xec, 0x8b, 0xa1, 0x36, 0xa6, 0x43, 0x6d,
0x0d, 0xa0, 0x5f, 0x56, 0x4d, 0xcb, 0x6f, 0x04, 0x0b, 0xc7, 0xdc, 0xe5, 0x24, 0xe6, 0xc4, 0xcb,
0x7f, 0x24, 0x4c, 0xe5, 0x86, 0x71, 0xd3, 0x44, 0x2c, 0xd7, 0xe1, 0x3c, 0x54, 0x39, 0xcf, 0xf2,
0x57, 0x7c, 0x8a, 0x28, 0x20, 0xfd, 0xa6, 0x34, 0x06, 0x5f, 0xe0, 0x2a, 0x91, 0x0f, 0x9c, 0x72,
0x37, 0x50, 0x1b, 0x47, 0x4d, 0x6e, 0x1c, 0xa6, 0xa4, 0xc8, 0x95, 0x43, 0x0d, 0x65, 0x5f, 0x71,
0xeb, 0x6a, 0x1f, 0x11, 0x04, 0xc9, 0x5c, 0x05, 0x90, 0xa5, 0xaa, 0xaa, 0xac, 0xa1, 0x74, 0x05,
0x65, 0x57, 0x10, 0xac, 0x35, 0x58, 0xf9, 0x33, 0xe6, 0x62, 0x77, 0x62, 0xbb, 0x34, 0x1a, 0x92,
0x51, 0xc2, 0x5c, 0x2d, 0x14, 0xd6, 0xff, 0x0d, 0x58, 0xbd, 0x42, 0x20, 0x7d, 0x70, 0x1f, 0x9a,
0xa1, 0x1b, 0x73, 0xcc, 0xb2, 0x2a, 0xc9, 0x8e, 0xd3, 0x50, 0x54, 0x6e, 0x82, 0xa2, 0x5a, 0x82,
0x62, 0x09, 0x1a, 0xa1, 0x7b, 0xe9, 0x84, 0x27, 0xe9, 0x72, 0x54, 0x0f, 0xdd, 0xcb, 0x57, 0x27,
0xb2, 0xb3, 0x11, 0xe6, 0x9c, 0x24, 0xde, 0x19, 0xe6, 0x71, 0xde, 0xd9, 0x08, 0x7b, 0xa9, 0x28,
0x3b, 0xff, 0x6b, 0x41, 0xe7, 0x18, 0xbb, 0x17, 0x18, 0xfb, 0xd2, 0x73, 0x34, 0xca, 0x2a, 0xa6,
0xf8, 0x1b, 0x14, 0x3d, 0x98, 0x2e, 0x8d, 0x99, 0x3f, 0x7a, 0x07, 0x0f, 0x6f, 0x12, 0x4b, 0x93,
0x6f, 0x0e, 0xbd, 0x86, 0xb6, 0xf6, 0x23, 0x0f, 0xad, 0x68, 0x8a, 0xa5, 0xdf, 0xae, 0x83, 0xd5,
0x2b, 0xb8, 0x99, 0xb5, 0x6d, 0x03, 0x1d, 0x41, 0x5b, 0xdb, 0x4d, 0x74, 0x7b, 0xe5, 0x25, 0x49,
0xb7, 0x37, 0x63, 0xa1, 0xb1, 0xe6, 0x84, 0x35, 0x6d, 0xc3, 0xd0, 0xad, 0x95, 0x77, 0x1a, 0xdd,
0xda, 0xac, 0xb5, 0x44, 0x5a, 0xd3, 0x06, 0xba, 0x6e, 0xad, 0xbc, 0xae, 0xe8, 0xd6, 0x66, 0x6c,
0x01, 0xd6, 0x1c, 0xfa, 0x00, 0xbd, 0x63, 0xce, 0xb0, 0x1b, 0x4e, 0xd8, 0x53, 0x08, 0xfe, 0x0c,
0xab, 0x9b, 0xc6, 0xb6, 0x81, 0xfe, 0x01, 0x0b, 0xa5, 0x71, 0x8d, 0xac, 0x89, 0xe6, 0x55, 0x7b,
0xc6, 0x60, 0xe3, 0x5a, 0x99, 0xdc, 0xf3, 0x37, 0xd0, 0xd1, 0xa7, 0x24, 0xd2, 0x9c, 0x9a, 0xb1,
0x08, 0x0c, 0xd6, 0xae, 0x62, 0xeb, 0x06, 0xf5, 0x46, 0xad, 0x1b, 0x9c, 0x31, 0xaa, 0x74, 0x83,
0xb3, 0xfa, 0xbb, 0x35, 0x87, 0xfe, 0x0e, 0xf3, 0xd3, 0x0d, 0x13, 0xdd, 0x9f, 0x86, 0xae, 0xd4,
0x87, 0x07, 0xd6, 0x75, 0x22, 0xb9, 0xf1, 0x43, 0x80, 0x49, 0x1f, 0x44, 0xcb, 0x13, 0x9d, 0x52,
0x1f, 0x1e, 0xac, 0xcc, 0x66, 0xe6, 0xa6, 0xfe, 0x09, 0x4b, 0x33, 0x9b, 0x0d, 0xd2, 0x0a, 0xf0,
0xba, 0x76, 0x35, 0xf8, 0xcd, 0x8d, 0x72, 0xd9, 0x5d, 0x2f, 0xd7, 0x60, 0x3e, 0x56, 0x2d, 0x62,
0x18, 0x6f, 0x79, 0x01, 0xc1, 0x11, 0x7f, 0x09, 0x52, 0xe3, 0x2d, 0xa3, 0x9c, 0x9e, 0x34, 0xe4,
0x1f, 0x63, 0xbf, 0xff, 0x29, 0x00, 0x00, 0xff, 0xff, 0x83, 0xa2, 0xc7, 0xb2, 0x27, 0x13, 0x00,
0x00,
}

View file

@ -73,11 +73,11 @@ func AfterEntryDeserialization(chunks []*FileChunk) {
func CreateEntry(ctx context.Context, client SeaweedFilerClient, request *CreateEntryRequest) error {
resp, err := client.CreateEntry(ctx, request)
if err == nil && resp.Error != "" {
return fmt.Errorf("CreateEntry: %v", resp.Error)
}
if err != nil {
return fmt.Errorf("CreateEntry: %v", err)
}
if resp.Error != "" {
return fmt.Errorf("CreateEntry: %v", resp.Error)
}
return err
}

View file

@ -80,6 +80,9 @@ func (fs *FilerSink) fetchAndWrite(ctx context.Context, sourceChunk *filer_pb.Fi
glog.V(0).Infof("assign volume failure %v: %v", request, err)
return err
}
if resp.Error != "" {
return fmt.Errorf("assign volume failure %v: %v", request, resp.Error)
}
fileId, host, auth = resp.FileId, resp.Url, security.EncodedJwt(resp.Auth)

View file

@ -280,11 +280,11 @@ func (fs *FilerServer) AssignVolume(ctx context.Context, req *filer_pb.AssignVol
assignResult, err := operation.Assign(fs.filer.GetMaster(), fs.grpcDialOption, assignRequest, altRequest)
if err != nil {
glog.V(3).Infof("AssignVolume: %v", err)
return nil, fmt.Errorf("assign volume: %v", err)
return &filer_pb.AssignVolumeResponse{Error: fmt.Sprintf("assign volume: %v", err)}, nil
}
if assignResult.Error != "" {
glog.V(3).Infof("AssignVolume error: %v", assignResult.Error)
return nil, fmt.Errorf("assign volume result: %v", assignResult.Error)
return &filer_pb.AssignVolumeResponse{Error: fmt.Sprintf("assign volume result: %v", assignResult.Error)}, nil
}
return &filer_pb.AssignVolumeResponse{
@ -295,7 +295,7 @@ func (fs *FilerServer) AssignVolume(ctx context.Context, req *filer_pb.AssignVol
Auth: string(assignResult.Auth),
Collection: collection,
Replication: replication,
}, err
}, nil
}
func (fs *FilerServer) DeleteCollection(ctx context.Context, req *filer_pb.DeleteCollectionRequest) (resp *filer_pb.DeleteCollectionResponse, err error) {

View file

@ -400,6 +400,9 @@ func (f *WebDavFile) Write(buf []byte) (int, error) {
glog.V(0).Infof("assign volume failure %v: %v", request, err)
return err
}
if resp.Error != "" {
return fmt.Errorf("assign volume failure %v: %v", request, resp.Error)
}
fileId, host, auth = resp.FileId, resp.Url, security.EncodedJwt(resp.Auth)
collection, replication = resp.Collection, resp.Replication