mirror of
https://github.com/chrislusf/seaweedfs
synced 2024-06-19 17:11:12 +02:00
add shell command to list all collections
This commit is contained in:
Chris Lu
parent
b92122b885
commit
657dd2e6c9
|
|
@ -1,21 +1,25 @@
|
|||
package command
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"fmt"
|
||||
"os"
|
||||
"github.com/chrislusf/seaweedfs/weed/security"
|
||||
"github.com/chrislusf/seaweedfs/weed/server"
|
||||
"github.com/chrislusf/seaweedfs/weed/shell"
|
||||
"github.com/spf13/viper"
|
||||
)
|
||||
|
||||
"github.com/chrislusf/seaweedfs/weed/glog"
|
||||
var (
|
||||
shellOptions shell.ShellOptions
|
||||
)
|
||||
|
||||
func init() {
|
||||
cmdShell.Run = runShell // break init cycle
|
||||
shellOptions.Masters = cmdShell.Flag.String("master", "localhost:9333", "comma-separated master servers")
|
||||
}
|
||||
|
||||
var cmdShell = &Command{
|
||||
UsageLine: "shell",
|
||||
Short: "run interactive commands, now just echo",
|
||||
Long: `run interactive commands.
|
||||
Short: "run interactive administrative commands",
|
||||
Long: `run interactive administrative commands.
|
||||
|
||||
`,
|
||||
}
|
||||
|
|
@ -23,39 +27,12 @@ var cmdShell = &Command{
|
|||
var ()
|
||||
|
||||
func runShell(command *Command, args []string) bool {
|
||||
r := bufio.NewReader(os.Stdin)
|
||||
o := bufio.NewWriter(os.Stdout)
|
||||
e := bufio.NewWriter(os.Stderr)
|
||||
prompt := func() {
|
||||
var err error
|
||||
if _, err = o.WriteString("> "); err != nil {
|
||||
glog.V(0).Infoln("error writing to stdout:", err)
|
||||
}
|
||||
if err = o.Flush(); err != nil {
|
||||
glog.V(0).Infoln("error flushing stdout:", err)
|
||||
}
|
||||
}
|
||||
readLine := func() string {
|
||||
ret, err := r.ReadString('\n')
|
||||
if err != nil {
|
||||
fmt.Fprint(e, err)
|
||||
os.Exit(1)
|
||||
}
|
||||
return ret
|
||||
}
|
||||
execCmd := func(cmd string) int {
|
||||
if cmd != "" {
|
||||
if _, err := o.WriteString(cmd); err != nil {
|
||||
glog.V(0).Infoln("error writing to stdout:", err)
|
||||
}
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
cmd := ""
|
||||
for {
|
||||
prompt()
|
||||
cmd = readLine()
|
||||
execCmd(cmd)
|
||||
}
|
||||
weed_server.LoadConfiguration("security", false)
|
||||
shellOptions.GrpcDialOption = security.LoadClientTLS(viper.Sub("grpc"), "client")
|
||||
|
||||
shell.RunShell(shellOptions)
|
||||
|
||||
return true
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,10 @@ service Seaweed {
|
|||
}
|
||||
rpc Statistics (StatisticsRequest) returns (StatisticsResponse) {
|
||||
}
|
||||
rpc CollectionList (CollectionListRequest) returns (CollectionListResponse) {
|
||||
}
|
||||
rpc CollectionDelete (CollectionDeleteRequest) returns (CollectionDeleteResponse) {
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////
|
||||
|
|
@ -124,3 +128,26 @@ message StatisticsResponse {
|
|||
uint64 used_size = 5;
|
||||
uint64 file_count = 6;
|
||||
}
|
||||
|
||||
//
|
||||
// collection related
|
||||
//
|
||||
|
||||
message StorageType {
|
||||
string replication = 1;
|
||||
string ttl = 2;
|
||||
}
|
||||
message Collection {
|
||||
string name = 1;
|
||||
}
|
||||
message CollectionListRequest {
|
||||
}
|
||||
message CollectionListResponse {
|
||||
repeated Collection collections = 1;
|
||||
}
|
||||
|
||||
message CollectionDeleteRequest {
|
||||
string name = 1;
|
||||
}
|
||||
message CollectionDeleteResponse {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,11 @@ It has these top-level messages:
|
|||
AssignResponse
|
||||
StatisticsRequest
|
||||
StatisticsResponse
|
||||
Collection
|
||||
CollectionListRequest
|
||||
CollectionListResponse
|
||||
CollectionDeleteRequest
|
||||
CollectionDeleteResponse
|
||||
*/
|
||||
package master_pb
|
||||
|
||||
|
|
@ -675,6 +680,102 @@ func (m *StatisticsResponse) GetFileCount() uint64 {
|
|||
return 0
|
||||
}
|
||||
|
||||
type Collection struct {
|
||||
Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
|
||||
Replication string `protobuf:"bytes,2,opt,name=replication" json:"replication,omitempty"`
|
||||
Ttl string `protobuf:"bytes,3,opt,name=ttl" json:"ttl,omitempty"`
|
||||
}
|
||||
|
||||
func (m *Collection) Reset() { *m = Collection{} }
|
||||
func (m *Collection) String() string { return proto.CompactTextString(m) }
|
||||
func (*Collection) ProtoMessage() {}
|
||||
func (*Collection) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
|
||||
|
||||
func (m *Collection) GetName() string {
|
||||
if m != nil {
|
||||
return m.Name
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (m *Collection) GetReplication() string {
|
||||
if m != nil {
|
||||
return m.Replication
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (m *Collection) GetTtl() string {
|
||||
if m != nil {
|
||||
return m.Ttl
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
type CollectionListRequest struct {
|
||||
Replication string `protobuf:"bytes,1,opt,name=replication" json:"replication,omitempty"`
|
||||
Ttl string `protobuf:"bytes,2,opt,name=ttl" json:"ttl,omitempty"`
|
||||
}
|
||||
|
||||
func (m *CollectionListRequest) Reset() { *m = CollectionListRequest{} }
|
||||
func (m *CollectionListRequest) String() string { return proto.CompactTextString(m) }
|
||||
func (*CollectionListRequest) ProtoMessage() {}
|
||||
func (*CollectionListRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
|
||||
|
||||
func (m *CollectionListRequest) GetReplication() string {
|
||||
if m != nil {
|
||||
return m.Replication
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (m *CollectionListRequest) GetTtl() string {
|
||||
if m != nil {
|
||||
return m.Ttl
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
type CollectionListResponse struct {
|
||||
Collections []*Collection `protobuf:"bytes,1,rep,name=collections" json:"collections,omitempty"`
|
||||
}
|
||||
|
||||
func (m *CollectionListResponse) Reset() { *m = CollectionListResponse{} }
|
||||
func (m *CollectionListResponse) String() string { return proto.CompactTextString(m) }
|
||||
func (*CollectionListResponse) ProtoMessage() {}
|
||||
func (*CollectionListResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
|
||||
|
||||
func (m *CollectionListResponse) GetCollections() []*Collection {
|
||||
if m != nil {
|
||||
return m.Collections
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type CollectionDeleteRequest struct {
|
||||
Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
|
||||
}
|
||||
|
||||
func (m *CollectionDeleteRequest) Reset() { *m = CollectionDeleteRequest{} }
|
||||
func (m *CollectionDeleteRequest) String() string { return proto.CompactTextString(m) }
|
||||
func (*CollectionDeleteRequest) ProtoMessage() {}
|
||||
func (*CollectionDeleteRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
|
||||
|
||||
func (m *CollectionDeleteRequest) GetName() string {
|
||||
if m != nil {
|
||||
return m.Name
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
type CollectionDeleteResponse struct {
|
||||
}
|
||||
|
||||
func (m *CollectionDeleteResponse) Reset() { *m = CollectionDeleteResponse{} }
|
||||
func (m *CollectionDeleteResponse) String() string { return proto.CompactTextString(m) }
|
||||
func (*CollectionDeleteResponse) ProtoMessage() {}
|
||||
func (*CollectionDeleteResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
|
||||
|
||||
func init() {
|
||||
proto.RegisterType((*Heartbeat)(nil), "master_pb.Heartbeat")
|
||||
proto.RegisterType((*HeartbeatResponse)(nil), "master_pb.HeartbeatResponse")
|
||||
|
|
@ -692,6 +793,11 @@ func init() {
|
|||
proto.RegisterType((*AssignResponse)(nil), "master_pb.AssignResponse")
|
||||
proto.RegisterType((*StatisticsRequest)(nil), "master_pb.StatisticsRequest")
|
||||
proto.RegisterType((*StatisticsResponse)(nil), "master_pb.StatisticsResponse")
|
||||
proto.RegisterType((*Collection)(nil), "master_pb.Collection")
|
||||
proto.RegisterType((*CollectionListRequest)(nil), "master_pb.CollectionListRequest")
|
||||
proto.RegisterType((*CollectionListResponse)(nil), "master_pb.CollectionListResponse")
|
||||
proto.RegisterType((*CollectionDeleteRequest)(nil), "master_pb.CollectionDeleteRequest")
|
||||
proto.RegisterType((*CollectionDeleteResponse)(nil), "master_pb.CollectionDeleteResponse")
|
||||
}
|
||||
|
||||
// Reference imports to suppress errors if they are not otherwise used.
|
||||
|
|
@ -710,6 +816,8 @@ type SeaweedClient interface {
|
|||
LookupVolume(ctx context.Context, in *LookupVolumeRequest, opts ...grpc.CallOption) (*LookupVolumeResponse, error)
|
||||
Assign(ctx context.Context, in *AssignRequest, opts ...grpc.CallOption) (*AssignResponse, error)
|
||||
Statistics(ctx context.Context, in *StatisticsRequest, opts ...grpc.CallOption) (*StatisticsResponse, error)
|
||||
CollectionList(ctx context.Context, in *CollectionListRequest, opts ...grpc.CallOption) (*CollectionListResponse, error)
|
||||
CollectionDelete(ctx context.Context, in *CollectionDeleteRequest, opts ...grpc.CallOption) (*CollectionDeleteResponse, error)
|
||||
}
|
||||
|
||||
type seaweedClient struct {
|
||||
|
|
@ -809,6 +917,24 @@ func (c *seaweedClient) Statistics(ctx context.Context, in *StatisticsRequest, o
|
|||
return out, nil
|
||||
}
|
||||
|
||||
func (c *seaweedClient) CollectionList(ctx context.Context, in *CollectionListRequest, opts ...grpc.CallOption) (*CollectionListResponse, error) {
|
||||
out := new(CollectionListResponse)
|
||||
err := grpc.Invoke(ctx, "/master_pb.Seaweed/CollectionList", in, out, c.cc, opts...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
func (c *seaweedClient) CollectionDelete(ctx context.Context, in *CollectionDeleteRequest, opts ...grpc.CallOption) (*CollectionDeleteResponse, error) {
|
||||
out := new(CollectionDeleteResponse)
|
||||
err := grpc.Invoke(ctx, "/master_pb.Seaweed/CollectionDelete", in, out, c.cc, opts...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// Server API for Seaweed service
|
||||
|
||||
type SeaweedServer interface {
|
||||
|
|
@ -817,6 +943,8 @@ type SeaweedServer interface {
|
|||
LookupVolume(context.Context, *LookupVolumeRequest) (*LookupVolumeResponse, error)
|
||||
Assign(context.Context, *AssignRequest) (*AssignResponse, error)
|
||||
Statistics(context.Context, *StatisticsRequest) (*StatisticsResponse, error)
|
||||
CollectionList(context.Context, *CollectionListRequest) (*CollectionListResponse, error)
|
||||
CollectionDelete(context.Context, *CollectionDeleteRequest) (*CollectionDeleteResponse, error)
|
||||
}
|
||||
|
||||
func RegisterSeaweedServer(s *grpc.Server, srv SeaweedServer) {
|
||||
|
|
@ -929,6 +1057,42 @@ func _Seaweed_Statistics_Handler(srv interface{}, ctx context.Context, dec func(
|
|||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
func _Seaweed_CollectionList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||
in := new(CollectionListRequest)
|
||||
if err := dec(in); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if interceptor == nil {
|
||||
return srv.(SeaweedServer).CollectionList(ctx, in)
|
||||
}
|
||||
info := &grpc.UnaryServerInfo{
|
||||
Server: srv,
|
||||
FullMethod: "/master_pb.Seaweed/CollectionList",
|
||||
}
|
||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
return srv.(SeaweedServer).CollectionList(ctx, req.(*CollectionListRequest))
|
||||
}
|
||||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
func _Seaweed_CollectionDelete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
|
||||
in := new(CollectionDeleteRequest)
|
||||
if err := dec(in); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if interceptor == nil {
|
||||
return srv.(SeaweedServer).CollectionDelete(ctx, in)
|
||||
}
|
||||
info := &grpc.UnaryServerInfo{
|
||||
Server: srv,
|
||||
FullMethod: "/master_pb.Seaweed/CollectionDelete",
|
||||
}
|
||||
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
|
||||
return srv.(SeaweedServer).CollectionDelete(ctx, req.(*CollectionDeleteRequest))
|
||||
}
|
||||
return interceptor(ctx, in, info, handler)
|
||||
}
|
||||
|
||||
var _Seaweed_serviceDesc = grpc.ServiceDesc{
|
||||
ServiceName: "master_pb.Seaweed",
|
||||
HandlerType: (*SeaweedServer)(nil),
|
||||
|
|
@ -945,6 +1109,14 @@ var _Seaweed_serviceDesc = grpc.ServiceDesc{
|
|||
MethodName: "Statistics",
|
||||
Handler: _Seaweed_Statistics_Handler,
|
||||
},
|
||||
{
|
||||
MethodName: "CollectionList",
|
||||
Handler: _Seaweed_CollectionList_Handler,
|
||||
},
|
||||
{
|
||||
MethodName: "CollectionDelete",
|
||||
Handler: _Seaweed_CollectionDelete_Handler,
|
||||
},
|
||||
},
|
||||
Streams: []grpc.StreamDesc{
|
||||
{
|
||||
|
|
@ -966,71 +1138,78 @@ var _Seaweed_serviceDesc = grpc.ServiceDesc{
|
|||
func init() { proto.RegisterFile("master.proto", fileDescriptor0) }
|
||||
|
||||
var fileDescriptor0 = []byte{
|
||||
// 1056 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0xe4, 0x44,
|
||||
0x10, 0x8e, 0x3d, 0xbf, 0xae, 0xc9, 0x64, 0x27, 0x9d, 0x08, 0x79, 0x67, 0xd9, 0xdd, 0xc1, 0x5c,
|
||||
0x06, 0x81, 0xa2, 0x25, 0x1c, 0x11, 0x42, 0x6c, 0x14, 0x44, 0x94, 0xc0, 0x06, 0x87, 0xdd, 0x03,
|
||||
0x17, 0xd3, 0xb1, 0x2b, 0xa1, 0x15, 0xff, 0xe1, 0x6e, 0x27, 0x33, 0x7b, 0xe1, 0xc8, 0x03, 0xf0,
|
||||
0x3e, 0x5c, 0xe0, 0xc6, 0xa3, 0x70, 0xe3, 0x09, 0x50, 0xff, 0xd8, 0xf1, 0x38, 0x19, 0x22, 0x21,
|
||||
0x71, 0xeb, 0xfe, 0xba, 0xba, 0xab, 0xfa, 0xfb, 0xaa, 0xaa, 0x1b, 0x36, 0x13, 0xca, 0x05, 0x16,
|
||||
0x7b, 0x79, 0x91, 0x89, 0x8c, 0x38, 0x7a, 0x16, 0xe4, 0xe7, 0xde, 0x5f, 0x36, 0x38, 0x5f, 0x21,
|
||||
0x2d, 0xc4, 0x39, 0x52, 0x41, 0xb6, 0xc0, 0x66, 0xb9, 0x6b, 0xcd, 0xac, 0xb9, 0xe3, 0xdb, 0x2c,
|
||||
0x27, 0x04, 0xba, 0x79, 0x56, 0x08, 0xd7, 0x9e, 0x59, 0xf3, 0xb1, 0xaf, 0xc6, 0xe4, 0x29, 0x40,
|
||||
0x5e, 0x9e, 0xc7, 0x2c, 0x0c, 0xca, 0x22, 0x76, 0x3b, 0xca, 0xd6, 0xd1, 0xc8, 0xeb, 0x22, 0x26,
|
||||
0x73, 0x98, 0x24, 0x74, 0x11, 0x5c, 0x67, 0x71, 0x99, 0x60, 0x10, 0x66, 0x65, 0x2a, 0xdc, 0xae,
|
||||
0xda, 0xbe, 0x95, 0xd0, 0xc5, 0x1b, 0x05, 0x1f, 0x48, 0x94, 0xcc, 0x64, 0x54, 0x8b, 0xe0, 0x82,
|
||||
0xc5, 0x18, 0x5c, 0xe1, 0xd2, 0xed, 0xcd, 0xac, 0x79, 0xd7, 0x87, 0x84, 0x2e, 0xbe, 0x64, 0x31,
|
||||
0x1e, 0xe3, 0x92, 0x3c, 0x87, 0x51, 0x44, 0x05, 0x0d, 0x42, 0x4c, 0x05, 0x16, 0x6e, 0x5f, 0xf9,
|
||||
0x02, 0x09, 0x1d, 0x28, 0x44, 0xc6, 0x57, 0xd0, 0xf0, 0xca, 0x1d, 0xa8, 0x15, 0x35, 0x96, 0xf1,
|
||||
0xd1, 0x28, 0x61, 0x69, 0xa0, 0x22, 0x1f, 0x2a, 0xd7, 0x8e, 0x42, 0x4e, 0x65, 0xf8, 0x9f, 0xc1,
|
||||
0x40, 0xc7, 0xc6, 0x5d, 0x67, 0xd6, 0x99, 0x8f, 0xf6, 0xdf, 0xdf, 0xab, 0xd9, 0xd8, 0xd3, 0xe1,
|
||||
0x1d, 0xa5, 0x17, 0x59, 0x91, 0x50, 0xc1, 0xb2, 0xf4, 0x6b, 0xe4, 0x9c, 0x5e, 0xa2, 0x5f, 0xed,
|
||||
0x21, 0x8f, 0x61, 0x98, 0xe2, 0x4d, 0x70, 0xcd, 0x22, 0xee, 0xc2, 0xac, 0x33, 0x1f, 0xfb, 0x83,
|
||||
0x14, 0x6f, 0xde, 0xb0, 0x88, 0x93, 0xf7, 0x60, 0x33, 0xc2, 0x18, 0x05, 0x46, 0x7a, 0x79, 0xa4,
|
||||
0x96, 0x47, 0x06, 0x93, 0x26, 0xde, 0x6b, 0xd8, 0xae, 0xc9, 0xf6, 0x91, 0xe7, 0x59, 0xca, 0x91,
|
||||
0xcc, 0xe1, 0x91, 0x3e, 0xfd, 0x8c, 0xbd, 0xc5, 0x13, 0x96, 0x30, 0xa1, 0x14, 0xe8, 0xfa, 0x6d,
|
||||
0x98, 0xbc, 0x03, 0xfd, 0x18, 0x69, 0x84, 0x85, 0xa1, 0xdd, 0xcc, 0xbc, 0x3f, 0x6c, 0x70, 0xd7,
|
||||
0x85, 0xae, 0x34, 0x8d, 0xd4, 0x89, 0x63, 0xdf, 0x66, 0x91, 0xe4, 0x8c, 0xb3, 0xb7, 0xa8, 0x34,
|
||||
0xed, 0xfa, 0x6a, 0x4c, 0x9e, 0x01, 0x84, 0x59, 0x1c, 0x63, 0x28, 0x37, 0x9a, 0xc3, 0x1b, 0x88,
|
||||
0xe4, 0x54, 0xc9, 0x74, 0x2b, 0x67, 0xd7, 0x77, 0x24, 0xa2, 0x95, 0xac, 0x6f, 0x6e, 0x0c, 0xb4,
|
||||
0x92, 0xe6, 0xe6, 0xda, 0xe4, 0x23, 0x20, 0x15, 0x39, 0xe7, 0xcb, 0xda, 0xb0, 0xaf, 0x0c, 0x27,
|
||||
0x66, 0xe5, 0xe5, 0xb2, 0xb2, 0x7e, 0x02, 0x4e, 0x81, 0x34, 0x0a, 0xb2, 0x34, 0x5e, 0x2a, 0x71,
|
||||
0x87, 0xfe, 0x50, 0x02, 0xaf, 0xd2, 0x78, 0x49, 0x3e, 0x84, 0xed, 0x02, 0xf3, 0x98, 0x85, 0x34,
|
||||
0xc8, 0x63, 0x1a, 0x62, 0x82, 0x69, 0xa5, 0xf3, 0xc4, 0x2c, 0x9c, 0x56, 0x38, 0x71, 0x61, 0x70,
|
||||
0x8d, 0x05, 0x97, 0xd7, 0x72, 0x94, 0x49, 0x35, 0x25, 0x13, 0xe8, 0x08, 0x11, 0xbb, 0xa0, 0x50,
|
||||
0x39, 0xf4, 0x06, 0xd0, 0x3b, 0x4c, 0x72, 0xb1, 0xf4, 0x7e, 0xb3, 0xe0, 0xd1, 0x59, 0x99, 0x63,
|
||||
0xf1, 0x32, 0xce, 0xc2, 0xab, 0xc3, 0x85, 0x28, 0x28, 0x79, 0x05, 0x5b, 0x58, 0x50, 0x5e, 0x16,
|
||||
0x32, 0xf6, 0x88, 0xa5, 0x97, 0x8a, 0xd2, 0xd1, 0xfe, 0xbc, 0x91, 0x3e, 0xad, 0x3d, 0x7b, 0x87,
|
||||
0x7a, 0xc3, 0x81, 0xb2, 0xf7, 0xc7, 0xd8, 0x9c, 0x4e, 0xbf, 0x87, 0xf1, 0xca, 0xba, 0x14, 0x46,
|
||||
0xa6, 0xb6, 0x91, 0x4a, 0x8d, 0xa5, 0xe2, 0x39, 0x2d, 0x98, 0x58, 0x9a, 0x12, 0x34, 0x33, 0x29,
|
||||
0x88, 0xa9, 0x30, 0x99, 0x69, 0x1d, 0x95, 0x69, 0x8e, 0x46, 0x8e, 0x22, 0xee, 0x7d, 0x00, 0x3b,
|
||||
0x07, 0x31, 0xc3, 0x54, 0x9c, 0x30, 0x2e, 0x30, 0xf5, 0xf1, 0xa7, 0x12, 0xb9, 0x90, 0x1e, 0x52,
|
||||
0x9a, 0xa0, 0x29, 0x70, 0x35, 0xf6, 0x7e, 0x86, 0x2d, 0x9d, 0x3a, 0x27, 0x59, 0xa8, 0xf2, 0x46,
|
||||
0x12, 0x23, 0x2b, 0x5b, 0x1b, 0xc9, 0x61, 0xab, 0xe4, 0xed, 0x76, 0xc9, 0x37, 0x6b, 0xa2, 0xf3,
|
||||
0xef, 0x35, 0xd1, 0xbd, 0x5b, 0x13, 0xdf, 0xc1, 0xce, 0x49, 0x96, 0x5d, 0x95, 0xb9, 0x0e, 0xa3,
|
||||
0x8a, 0x75, 0xf5, 0x86, 0xd6, 0xac, 0x23, 0x7d, 0xd6, 0x37, 0x6c, 0x65, 0xac, 0xdd, 0xce, 0x58,
|
||||
0xef, 0x6f, 0x0b, 0x76, 0x57, 0x8f, 0x35, 0xd5, 0xf6, 0x03, 0xec, 0xd4, 0xe7, 0x06, 0xb1, 0xb9,
|
||||
0xb3, 0x76, 0x30, 0xda, 0x7f, 0xd1, 0x10, 0xf3, 0xbe, 0xdd, 0x55, 0x83, 0x88, 0x2a, 0xb2, 0xfc,
|
||||
0xed, 0xeb, 0x16, 0xc2, 0xa7, 0x0b, 0x98, 0xb4, 0xcd, 0x64, 0x42, 0xd7, 0x5e, 0x0d, 0xb3, 0xc3,
|
||||
0x6a, 0x27, 0xf9, 0x18, 0x9c, 0xdb, 0x40, 0x6c, 0x15, 0xc8, 0xce, 0x4a, 0x20, 0xc6, 0xd7, 0xad,
|
||||
0x15, 0xd9, 0x85, 0x1e, 0x16, 0x45, 0x56, 0x35, 0x02, 0x3d, 0xf1, 0x3e, 0x85, 0xe1, 0x7f, 0x56,
|
||||
0xd1, 0xfb, 0xd3, 0x82, 0xf1, 0x17, 0x9c, 0xb3, 0xcb, 0x3a, 0x5d, 0x76, 0xa1, 0xa7, 0xcb, 0x54,
|
||||
0xb7, 0x23, 0x3d, 0x21, 0x33, 0x18, 0x99, 0x2a, 0x6b, 0x50, 0xdf, 0x84, 0x1e, 0xec, 0x26, 0xa6,
|
||||
0xf2, 0xba, 0x3a, 0x34, 0x21, 0xe2, 0x76, 0xa3, 0xef, 0xad, 0x6d, 0xf4, 0xfd, 0x46, 0xa3, 0x7f,
|
||||
0x02, 0x8e, 0xda, 0x94, 0x66, 0x11, 0x9a, 0x17, 0x60, 0x28, 0x81, 0x6f, 0xb2, 0x08, 0xbd, 0x5f,
|
||||
0x2d, 0xd8, 0xaa, 0x6e, 0x63, 0x94, 0x9f, 0x40, 0xe7, 0xa2, 0x66, 0x5f, 0x0e, 0x2b, 0x8e, 0xec,
|
||||
0x75, 0x1c, 0xdd, 0x79, 0xdc, 0x6a, 0x46, 0xba, 0x4d, 0x46, 0x6a, 0x31, 0x7a, 0x0d, 0x31, 0x64,
|
||||
0xc8, 0xb4, 0x14, 0x3f, 0x56, 0x21, 0xcb, 0xb1, 0x77, 0x09, 0xdb, 0x67, 0x82, 0x0a, 0xc6, 0x05,
|
||||
0x0b, 0x79, 0x45, 0x73, 0x8b, 0x50, 0xeb, 0x21, 0x42, 0xed, 0x75, 0x84, 0x76, 0x6a, 0x42, 0xbd,
|
||||
0xdf, 0x2d, 0x20, 0x4d, 0x4f, 0x86, 0x82, 0xff, 0xc1, 0x95, 0xa4, 0x4c, 0x64, 0x82, 0xc6, 0x81,
|
||||
0x7a, 0x55, 0xcc, 0xdb, 0xa0, 0x10, 0xf9, 0x70, 0x49, 0x95, 0x4a, 0x8e, 0x91, 0x5e, 0xd5, 0x0f,
|
||||
0xc3, 0x50, 0x02, 0x6a, 0x71, 0xf5, 0x5d, 0xe9, 0xb7, 0xde, 0x95, 0xfd, 0x5f, 0x3a, 0x30, 0x38,
|
||||
0x43, 0x7a, 0x83, 0x18, 0x91, 0x23, 0x18, 0x9f, 0x61, 0x1a, 0xdd, 0xfe, 0x55, 0x76, 0x1b, 0x25,
|
||||
0x52, 0xa3, 0xd3, 0x77, 0xef, 0x43, 0xab, 0xfb, 0x7b, 0x1b, 0x73, 0xeb, 0x85, 0x45, 0x4e, 0x61,
|
||||
0x7c, 0x8c, 0x98, 0x1f, 0x64, 0x69, 0x8a, 0xa1, 0xc0, 0x88, 0x3c, 0x6b, 0x6c, 0xba, 0xa7, 0x6f,
|
||||
0x4e, 0x1f, 0xdf, 0xf9, 0x22, 0x54, 0x65, 0x66, 0x4e, 0xfc, 0x16, 0x36, 0x9b, 0xed, 0x62, 0xe5,
|
||||
0xc0, 0x7b, 0x9a, 0xdb, 0xf4, 0xf9, 0x03, 0x7d, 0xc6, 0xdb, 0x20, 0x9f, 0x43, 0x5f, 0xe7, 0x2f,
|
||||
0x71, 0x1b, 0xc6, 0x2b, 0x05, 0xba, 0x12, 0xd7, 0x6a, 0xb2, 0x7b, 0x1b, 0xe4, 0x18, 0xe0, 0x36,
|
||||
0x03, 0x48, 0x93, 0x97, 0x3b, 0x29, 0x38, 0x7d, 0xba, 0x66, 0xb5, 0x3a, 0xec, 0xbc, 0xaf, 0x3e,
|
||||
0x8e, 0x9f, 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0x25, 0xfc, 0xb7, 0x54, 0x48, 0x0a, 0x00, 0x00,
|
||||
// 1164 bytes of a gzipped FileDescriptorProto
|
||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x57, 0xdd, 0x72, 0xdb, 0x44,
|
||||
0x14, 0xae, 0xe4, 0x5f, 0x1d, 0xc7, 0xae, 0xb3, 0x49, 0x8b, 0xea, 0xd2, 0xd6, 0x55, 0x6f, 0xcc,
|
||||
0x00, 0x99, 0x12, 0x2e, 0xb8, 0x60, 0x18, 0x86, 0x9a, 0x30, 0x64, 0x12, 0x68, 0xaa, 0xb4, 0x65,
|
||||
0x86, 0x19, 0x46, 0x6c, 0xa4, 0x93, 0xb0, 0x13, 0x59, 0x12, 0xd2, 0x3a, 0xb1, 0x7b, 0xc3, 0x43,
|
||||
0xf0, 0x3e, 0x70, 0x01, 0x77, 0x3c, 0x0a, 0x77, 0x3c, 0x01, 0xb3, 0x3f, 0x92, 0x65, 0xd9, 0x49,
|
||||
0x3a, 0xcc, 0x70, 0xb7, 0xfa, 0xf6, 0xec, 0xd9, 0xb3, 0xdf, 0x77, 0x7e, 0x6c, 0xd8, 0x98, 0xd0,
|
||||
0x8c, 0x63, 0xba, 0x93, 0xa4, 0x31, 0x8f, 0x89, 0xa5, 0xbe, 0xbc, 0xe4, 0xc4, 0xf9, 0xdb, 0x04,
|
||||
0xeb, 0x6b, 0xa4, 0x29, 0x3f, 0x41, 0xca, 0x49, 0x0f, 0x4c, 0x96, 0xd8, 0xc6, 0xd0, 0x18, 0x59,
|
||||
0xae, 0xc9, 0x12, 0x42, 0xa0, 0x9e, 0xc4, 0x29, 0xb7, 0xcd, 0xa1, 0x31, 0xea, 0xba, 0x72, 0x4d,
|
||||
0x1e, 0x00, 0x24, 0xd3, 0x93, 0x90, 0xf9, 0xde, 0x34, 0x0d, 0xed, 0x9a, 0xb4, 0xb5, 0x14, 0xf2,
|
||||
0x2a, 0x0d, 0xc9, 0x08, 0xfa, 0x13, 0x3a, 0xf3, 0x2e, 0xe2, 0x70, 0x3a, 0x41, 0xcf, 0x8f, 0xa7,
|
||||
0x11, 0xb7, 0xeb, 0xf2, 0x78, 0x6f, 0x42, 0x67, 0xaf, 0x25, 0x3c, 0x16, 0x28, 0x19, 0x8a, 0xa8,
|
||||
0x66, 0xde, 0x29, 0x0b, 0xd1, 0x3b, 0xc7, 0xb9, 0xdd, 0x18, 0x1a, 0xa3, 0xba, 0x0b, 0x13, 0x3a,
|
||||
0xfb, 0x8a, 0x85, 0x78, 0x80, 0x73, 0xf2, 0x08, 0x3a, 0x01, 0xe5, 0xd4, 0xf3, 0x31, 0xe2, 0x98,
|
||||
0xda, 0x4d, 0x79, 0x17, 0x08, 0x68, 0x2c, 0x11, 0x11, 0x5f, 0x4a, 0xfd, 0x73, 0xbb, 0x25, 0x77,
|
||||
0xe4, 0x5a, 0xc4, 0x47, 0x83, 0x09, 0x8b, 0x3c, 0x19, 0x79, 0x5b, 0x5e, 0x6d, 0x49, 0xe4, 0x48,
|
||||
0x84, 0xff, 0x19, 0xb4, 0x54, 0x6c, 0x99, 0x6d, 0x0d, 0x6b, 0xa3, 0xce, 0xee, 0x93, 0x9d, 0x82,
|
||||
0x8d, 0x1d, 0x15, 0xde, 0x7e, 0x74, 0x1a, 0xa7, 0x13, 0xca, 0x59, 0x1c, 0x7d, 0x83, 0x59, 0x46,
|
||||
0xcf, 0xd0, 0xcd, 0xcf, 0x90, 0x7b, 0xd0, 0x8e, 0xf0, 0xd2, 0xbb, 0x60, 0x41, 0x66, 0xc3, 0xb0,
|
||||
0x36, 0xea, 0xba, 0xad, 0x08, 0x2f, 0x5f, 0xb3, 0x20, 0x23, 0x8f, 0x61, 0x23, 0xc0, 0x10, 0x39,
|
||||
0x06, 0x6a, 0xbb, 0x23, 0xb7, 0x3b, 0x1a, 0x13, 0x26, 0xce, 0x2b, 0xd8, 0x2c, 0xc8, 0x76, 0x31,
|
||||
0x4b, 0xe2, 0x28, 0x43, 0x32, 0x82, 0xdb, 0xca, 0xfb, 0x31, 0x7b, 0x83, 0x87, 0x6c, 0xc2, 0xb8,
|
||||
0x54, 0xa0, 0xee, 0x56, 0x61, 0x72, 0x17, 0x9a, 0x21, 0xd2, 0x00, 0x53, 0x4d, 0xbb, 0xfe, 0x72,
|
||||
0xfe, 0x34, 0xc1, 0xbe, 0x2a, 0x74, 0xa9, 0x69, 0x20, 0x3d, 0x76, 0x5d, 0x93, 0x05, 0x82, 0xb3,
|
||||
0x8c, 0xbd, 0x41, 0xa9, 0x69, 0xdd, 0x95, 0x6b, 0xf2, 0x10, 0xc0, 0x8f, 0xc3, 0x10, 0x7d, 0x71,
|
||||
0x50, 0x3b, 0x2f, 0x21, 0x82, 0x53, 0x29, 0xd3, 0x42, 0xce, 0xba, 0x6b, 0x09, 0x44, 0x29, 0x59,
|
||||
0xbc, 0x5c, 0x1b, 0x28, 0x25, 0xf5, 0xcb, 0x95, 0xc9, 0x07, 0x40, 0x72, 0x72, 0x4e, 0xe6, 0x85,
|
||||
0x61, 0x53, 0x1a, 0xf6, 0xf5, 0xce, 0xb3, 0x79, 0x6e, 0x7d, 0x1f, 0xac, 0x14, 0x69, 0xe0, 0xc5,
|
||||
0x51, 0x38, 0x97, 0xe2, 0xb6, 0xdd, 0xb6, 0x00, 0x9e, 0x47, 0xe1, 0x9c, 0xbc, 0x0f, 0x9b, 0x29,
|
||||
0x26, 0x21, 0xf3, 0xa9, 0x97, 0x84, 0xd4, 0xc7, 0x09, 0x46, 0xb9, 0xce, 0x7d, 0xbd, 0x71, 0x94,
|
||||
0xe3, 0xc4, 0x86, 0xd6, 0x05, 0xa6, 0x99, 0x78, 0x96, 0x25, 0x4d, 0xf2, 0x4f, 0xd2, 0x87, 0x1a,
|
||||
0xe7, 0xa1, 0x0d, 0x12, 0x15, 0x4b, 0xa7, 0x05, 0x8d, 0xbd, 0x49, 0xc2, 0xe7, 0xce, 0x6f, 0x06,
|
||||
0xdc, 0x3e, 0x9e, 0x26, 0x98, 0x3e, 0x0b, 0x63, 0xff, 0x7c, 0x6f, 0xc6, 0x53, 0x4a, 0x9e, 0x43,
|
||||
0x0f, 0x53, 0x9a, 0x4d, 0x53, 0x11, 0x7b, 0xc0, 0xa2, 0x33, 0x49, 0x69, 0x67, 0x77, 0x54, 0x4a,
|
||||
0x9f, 0xca, 0x99, 0x9d, 0x3d, 0x75, 0x60, 0x2c, 0xed, 0xdd, 0x2e, 0x96, 0x3f, 0x07, 0xdf, 0x43,
|
||||
0x77, 0x69, 0x5f, 0x08, 0x23, 0x52, 0x5b, 0x4b, 0x25, 0xd7, 0x42, 0xf1, 0x84, 0xa6, 0x8c, 0xcf,
|
||||
0x75, 0x09, 0xea, 0x2f, 0x21, 0x88, 0xae, 0x30, 0x91, 0x69, 0x35, 0x99, 0x69, 0x96, 0x42, 0xf6,
|
||||
0x83, 0xcc, 0x79, 0x0f, 0xb6, 0xc6, 0x21, 0xc3, 0x88, 0x1f, 0xb2, 0x8c, 0x63, 0xe4, 0xe2, 0xcf,
|
||||
0x53, 0xcc, 0xb8, 0xb8, 0x21, 0xa2, 0x13, 0xd4, 0x05, 0x2e, 0xd7, 0xce, 0x2f, 0xd0, 0x53, 0xa9,
|
||||
0x73, 0x18, 0xfb, 0x32, 0x6f, 0x04, 0x31, 0xa2, 0xb2, 0x95, 0x91, 0x58, 0x56, 0x4a, 0xde, 0xac,
|
||||
0x96, 0x7c, 0xb9, 0x26, 0x6a, 0xd7, 0xd7, 0x44, 0x7d, 0xb5, 0x26, 0x5e, 0xc2, 0xd6, 0x61, 0x1c,
|
||||
0x9f, 0x4f, 0x13, 0x15, 0x46, 0x1e, 0xeb, 0xf2, 0x0b, 0x8d, 0x61, 0x4d, 0xdc, 0x59, 0xbc, 0xb0,
|
||||
0x92, 0xb1, 0x66, 0x35, 0x63, 0x9d, 0x7f, 0x0c, 0xd8, 0x5e, 0x76, 0xab, 0xab, 0xed, 0x47, 0xd8,
|
||||
0x2a, 0xfc, 0x7a, 0xa1, 0x7e, 0xb3, 0xba, 0xa0, 0xb3, 0xfb, 0xb4, 0x24, 0xe6, 0xba, 0xd3, 0x79,
|
||||
0x83, 0x08, 0x72, 0xb2, 0xdc, 0xcd, 0x8b, 0x0a, 0x92, 0x0d, 0x66, 0xd0, 0xaf, 0x9a, 0x89, 0x84,
|
||||
0x2e, 0x6e, 0xd5, 0xcc, 0xb6, 0xf3, 0x93, 0xe4, 0x23, 0xb0, 0x16, 0x81, 0x98, 0x32, 0x90, 0xad,
|
||||
0xa5, 0x40, 0xf4, 0x5d, 0x0b, 0x2b, 0xb2, 0x0d, 0x0d, 0x4c, 0xd3, 0x38, 0x6f, 0x04, 0xea, 0xc3,
|
||||
0xf9, 0x14, 0xda, 0xff, 0x59, 0x45, 0xe7, 0x2f, 0x03, 0xba, 0x5f, 0x64, 0x19, 0x3b, 0x2b, 0xd2,
|
||||
0x65, 0x1b, 0x1a, 0xaa, 0x4c, 0x55, 0x3b, 0x52, 0x1f, 0x64, 0x08, 0x1d, 0x5d, 0x65, 0x25, 0xea,
|
||||
0xcb, 0xd0, 0x8d, 0xdd, 0x44, 0x57, 0x5e, 0x5d, 0x85, 0xc6, 0x79, 0x58, 0x6d, 0xf4, 0x8d, 0x2b,
|
||||
0x1b, 0x7d, 0xb3, 0xd4, 0xe8, 0xef, 0x83, 0x25, 0x0f, 0x45, 0x71, 0x80, 0x7a, 0x02, 0xb4, 0x05,
|
||||
0xf0, 0x6d, 0x1c, 0xa0, 0xf3, 0xab, 0x01, 0xbd, 0xfc, 0x35, 0x5a, 0xf9, 0x3e, 0xd4, 0x4e, 0x0b,
|
||||
0xf6, 0xc5, 0x32, 0xe7, 0xc8, 0xbc, 0x8a, 0xa3, 0x95, 0xe1, 0x56, 0x30, 0x52, 0x2f, 0x33, 0x52,
|
||||
0x88, 0xd1, 0x28, 0x89, 0x21, 0x42, 0xa6, 0x53, 0xfe, 0x53, 0x1e, 0xb2, 0x58, 0x3b, 0x67, 0xb0,
|
||||
0x79, 0xcc, 0x29, 0x67, 0x19, 0x67, 0x7e, 0x96, 0xd3, 0x5c, 0x21, 0xd4, 0xb8, 0x89, 0x50, 0xf3,
|
||||
0x2a, 0x42, 0x6b, 0x05, 0xa1, 0xce, 0x1f, 0x06, 0x90, 0xf2, 0x4d, 0x9a, 0x82, 0xff, 0xe1, 0x2a,
|
||||
0x41, 0x19, 0x8f, 0x39, 0x0d, 0x3d, 0x39, 0x55, 0xf4, 0x6c, 0x90, 0x88, 0x18, 0x5c, 0x42, 0xa5,
|
||||
0x69, 0x86, 0x81, 0xda, 0x55, 0x83, 0xa1, 0x2d, 0x00, 0xb9, 0xb9, 0x3c, 0x57, 0x9a, 0x95, 0xb9,
|
||||
0xe2, 0xbc, 0x04, 0x18, 0x2f, 0xae, 0x5e, 0xd3, 0xbd, 0xde, 0x22, 0x19, 0x57, 0xb9, 0x39, 0x80,
|
||||
0x3b, 0x0b, 0xaf, 0xa2, 0x41, 0xbe, 0xbd, 0x10, 0xda, 0x99, 0xb9, 0x70, 0xf6, 0x02, 0xee, 0x56,
|
||||
0x9d, 0x69, 0xae, 0x3f, 0x81, 0xce, 0x82, 0xb7, 0xbc, 0xc1, 0xdc, 0x29, 0xd5, 0xf5, 0xe2, 0x9c,
|
||||
0x5b, 0xb6, 0x74, 0x3e, 0x84, 0x77, 0x16, 0x5b, 0x5f, 0xca, 0x4e, 0x79, 0x5d, 0x03, 0x1f, 0x80,
|
||||
0xbd, 0x6a, 0xae, 0x62, 0xd8, 0xfd, 0xbd, 0x0e, 0xad, 0x63, 0xa4, 0x97, 0x88, 0x01, 0xd9, 0x87,
|
||||
0xee, 0x31, 0x46, 0xc1, 0xe2, 0xc7, 0xde, 0x76, 0x29, 0x96, 0x02, 0x1d, 0xbc, 0xbb, 0x0e, 0xcd,
|
||||
0x1d, 0x3a, 0xb7, 0x46, 0xc6, 0x53, 0x83, 0x1c, 0x41, 0xf7, 0x00, 0x31, 0x19, 0xc7, 0x51, 0x84,
|
||||
0x3e, 0xc7, 0x80, 0x3c, 0x2c, 0x3f, 0x6b, 0x75, 0xf0, 0x0c, 0xee, 0xad, 0xfc, 0xc6, 0xca, 0xfb,
|
||||
0x94, 0xf6, 0xf8, 0x02, 0x36, 0xca, 0xfd, 0x76, 0xc9, 0xe1, 0x9a, 0xe9, 0x30, 0x78, 0x74, 0x43,
|
||||
0xa3, 0x76, 0x6e, 0x91, 0xcf, 0xa1, 0xa9, 0x1a, 0x00, 0xb1, 0x4b, 0xc6, 0x4b, 0x1d, 0x6e, 0x29,
|
||||
0xae, 0xe5, 0x6e, 0xe1, 0xdc, 0x22, 0x07, 0x00, 0x8b, 0x12, 0x22, 0x65, 0x5e, 0x56, 0x6a, 0x78,
|
||||
0xf0, 0xe0, 0x8a, 0xdd, 0xc2, 0xd9, 0x77, 0xd0, 0x5b, 0xce, 0x13, 0x32, 0x5c, 0x9b, 0x0a, 0xa5,
|
||||
0x7c, 0x1c, 0x3c, 0xbe, 0xc6, 0xa2, 0x70, 0xfc, 0x03, 0xf4, 0xab, 0xf2, 0x13, 0x67, 0xed, 0xc1,
|
||||
0xa5, 0x54, 0x1a, 0x3c, 0xb9, 0xd6, 0x26, 0x77, 0x7f, 0xd2, 0x94, 0xff, 0x18, 0x3e, 0xfe, 0x37,
|
||||
0x00, 0x00, 0xff, 0xff, 0xb1, 0x11, 0x1b, 0x49, 0x41, 0x0c, 0x00, 0x00,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ import (
|
|||
"github.com/chrislusf/seaweedfs/weed/operation"
|
||||
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
|
||||
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
|
||||
"github.com/chrislusf/seaweedfs/weed/util"
|
||||
)
|
||||
|
||||
func (fs *FilerServer) LookupDirectoryEntry(ctx context.Context, req *filer_pb.LookupDirectoryEntryRequest) (*filer_pb.LookupDirectoryEntryResponse, error) {
|
||||
|
|
@ -239,9 +238,7 @@ func (fs *FilerServer) AssignVolume(ctx context.Context, req *filer_pb.AssignVol
|
|||
|
||||
func (fs *FilerServer) DeleteCollection(ctx context.Context, req *filer_pb.DeleteCollectionRequest) (resp *filer_pb.DeleteCollectionResponse, err error) {
|
||||
|
||||
for _, master := range fs.option.Masters {
|
||||
_, err = util.Get(fmt.Sprintf("http://%s/col/delete?collection=%s", master, req.Collection))
|
||||
}
|
||||
err = fs.filer.MasterClient.CollectionDelete(ctx, req.GetCollection())
|
||||
|
||||
return &filer_pb.DeleteCollectionResponse{}, err
|
||||
}
|
||||
|
|
|
|||
56
weed/server/master_grpc_server_collection.go
Normal file
56
weed/server/master_grpc_server_collection.go
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
package weed_server
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"github.com/chrislusf/raft"
|
||||
"github.com/chrislusf/seaweedfs/weed/operation"
|
||||
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
|
||||
"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
|
||||
)
|
||||
|
||||
func (ms *MasterServer) CollectionList(ctx context.Context, req *master_pb.CollectionListRequest) (*master_pb.CollectionListResponse, error) {
|
||||
|
||||
if !ms.Topo.IsLeader() {
|
||||
return nil, raft.NotLeaderError
|
||||
}
|
||||
|
||||
resp := &master_pb.CollectionListResponse{}
|
||||
collections := ms.Topo.ListCollections()
|
||||
for _, c := range collections {
|
||||
resp.Collections = append(resp.Collections, &master_pb.Collection{
|
||||
Name: c.Name,
|
||||
})
|
||||
}
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
func (ms *MasterServer) CollectionDelete(ctx context.Context, req *master_pb.CollectionDeleteRequest) (*master_pb.CollectionDeleteResponse, error) {
|
||||
|
||||
if !ms.Topo.IsLeader() {
|
||||
return nil, raft.NotLeaderError
|
||||
}
|
||||
|
||||
resp := &master_pb.CollectionDeleteResponse{}
|
||||
|
||||
collection, ok := ms.Topo.FindCollection(req.GetName())
|
||||
if !ok {
|
||||
return resp, fmt.Errorf("collection not found: %v", req.GetName())
|
||||
}
|
||||
|
||||
for _, server := range collection.ListVolumeServers() {
|
||||
err := operation.WithVolumeServerClient(server.Url(), ms.grpcDialOpiton, func(client volume_server_pb.VolumeServerClient) error {
|
||||
_, deleteErr := client.DeleteCollection(context.Background(), &volume_server_pb.DeleteCollectionRequest{
|
||||
Collection: collection.Name,
|
||||
})
|
||||
return deleteErr
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
ms.Topo.DeleteCollection(req.GetName())
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
39
weed/shell/command_collection_list.go
Normal file
39
weed/shell/command_collection_list.go
Normal file
|
|
@ -0,0 +1,39 @@
|
|||
package shell
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"io"
|
||||
)
|
||||
|
||||
func init() {
|
||||
commands = append(commands, &commandCollectionList{})
|
||||
}
|
||||
|
||||
type commandCollectionList struct {
|
||||
}
|
||||
|
||||
func (c *commandCollectionList) Name() string {
|
||||
return "collection.list"
|
||||
}
|
||||
|
||||
func (c *commandCollectionList) Help() string {
|
||||
return "\t\t # list all collections"
|
||||
}
|
||||
|
||||
func (c *commandCollectionList) Do(args []string, commandEnv *commandEnv, writer io.Writer) error {
|
||||
|
||||
resp, err := commandEnv.masterClient.CollectionList(context.Background())
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
for _, c := range resp.Collections {
|
||||
fmt.Fprintf(writer, "collection:\"%s\"\n", c.GetName())
|
||||
}
|
||||
|
||||
fmt.Fprintf(writer, "Total %d collections.\n", len(resp.Collections))
|
||||
|
||||
return nil
|
||||
}
|
||||
27
weed/shell/commands.go
Normal file
27
weed/shell/commands.go
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
package shell
|
||||
|
||||
import (
|
||||
"github.com/chrislusf/seaweedfs/weed/wdclient"
|
||||
"google.golang.org/grpc"
|
||||
"io"
|
||||
)
|
||||
|
||||
type ShellOptions struct {
|
||||
Masters *string
|
||||
GrpcDialOption grpc.DialOption
|
||||
}
|
||||
|
||||
type commandEnv struct {
|
||||
env map[string]string
|
||||
masterClient *wdclient.MasterClient
|
||||
}
|
||||
|
||||
type command interface {
|
||||
Name() string
|
||||
Help() string
|
||||
Do([]string, *commandEnv, io.Writer) error
|
||||
}
|
||||
|
||||
var (
|
||||
commands = []command{}
|
||||
)
|
||||
143
weed/shell/shell_liner.go
Normal file
143
weed/shell/shell_liner.go
Normal file
|
|
@ -0,0 +1,143 @@
|
|||
package shell
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"github.com/chrislusf/seaweedfs/weed/wdclient"
|
||||
"os"
|
||||
"regexp"
|
||||
"strings"
|
||||
|
||||
"github.com/peterh/liner"
|
||||
"sort"
|
||||
)
|
||||
|
||||
var (
|
||||
line *liner.State
|
||||
historyPath = "/tmp/weed-shell"
|
||||
)
|
||||
|
||||
func RunShell(options ShellOptions) {
|
||||
|
||||
line = liner.NewLiner()
|
||||
defer line.Close()
|
||||
|
||||
line.SetCtrlCAborts(true)
|
||||
|
||||
setCompletionHandler()
|
||||
loadHisotry()
|
||||
|
||||
defer saveHisotry()
|
||||
|
||||
reg, _ := regexp.Compile(`'.*?'|".*?"|\S+`)
|
||||
|
||||
commandEnv := &commandEnv{
|
||||
env: make(map[string]string),
|
||||
masterClient: wdclient.NewMasterClient(context.Background(),
|
||||
options.GrpcDialOption, "shell", strings.Split(*options.Masters, ",")),
|
||||
}
|
||||
|
||||
go commandEnv.masterClient.KeepConnectedToMaster()
|
||||
commandEnv.masterClient.WaitUntilConnected()
|
||||
|
||||
for {
|
||||
cmd, err := line.Prompt("> ")
|
||||
if err != nil {
|
||||
fmt.Printf("%v\n", err)
|
||||
return
|
||||
}
|
||||
|
||||
cmds := reg.FindAllString(cmd, -1)
|
||||
if len(cmds) == 0 {
|
||||
continue
|
||||
} else {
|
||||
line.AppendHistory(cmd)
|
||||
|
||||
args := make([]string, len(cmds[1:]))
|
||||
|
||||
for i := range args {
|
||||
args[i] = strings.Trim(string(cmds[1+i]), "\"'")
|
||||
}
|
||||
|
||||
cmd := strings.ToLower(cmds[0])
|
||||
if cmd == "help" || cmd == "?" {
|
||||
printHelp(cmds)
|
||||
} else if cmd == "exit" || cmd == "quit" {
|
||||
return
|
||||
} else {
|
||||
for _, c := range commands {
|
||||
if c.Name() == cmd {
|
||||
if err := c.Do(args, commandEnv, os.Stderr); err != nil {
|
||||
fmt.Fprintf(os.Stderr, "error: %v\n", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func printGenericHelp() {
|
||||
msg :=
|
||||
`Type: "help <command>" for help on <command>
|
||||
`
|
||||
fmt.Print(msg)
|
||||
|
||||
sort.Slice(commands, func(i, j int) bool {
|
||||
return strings.Compare(commands[i].Name(), commands[j].Name()) < 0
|
||||
})
|
||||
for _, c := range commands {
|
||||
fmt.Printf("\t%s %s \n", c.Name(), c.Help())
|
||||
}
|
||||
}
|
||||
|
||||
func printHelp(cmds []string) {
|
||||
args := cmds[1:]
|
||||
if len(args) == 0 {
|
||||
printGenericHelp()
|
||||
} else if len(args) > 1 {
|
||||
fmt.Println()
|
||||
} else {
|
||||
cmd := strings.ToLower(args[0])
|
||||
|
||||
sort.Slice(commands, func(i, j int) bool {
|
||||
return strings.Compare(commands[i].Name(), commands[j].Name()) < 0
|
||||
})
|
||||
|
||||
for _, c := range commands {
|
||||
if c.Name() == cmd {
|
||||
fmt.Println()
|
||||
fmt.Printf("\t%s %s \n", c.Name(), c.Help())
|
||||
fmt.Println()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func setCompletionHandler() {
|
||||
line.SetCompleter(func(line string) (c []string) {
|
||||
for _, i := range commands {
|
||||
if strings.HasPrefix(i.Name(), strings.ToLower(line)) {
|
||||
c = append(c, i.Name())
|
||||
}
|
||||
}
|
||||
return
|
||||
})
|
||||
}
|
||||
|
||||
func loadHisotry() {
|
||||
if f, err := os.Open(historyPath); err == nil {
|
||||
line.ReadHistory(f)
|
||||
f.Close()
|
||||
}
|
||||
}
|
||||
|
||||
func saveHisotry() {
|
||||
if f, err := os.Create(historyPath); err != nil {
|
||||
fmt.Printf("Error writing history file: %v\n", err)
|
||||
} else {
|
||||
line.WriteHistory(f)
|
||||
f.Close()
|
||||
}
|
||||
}
|
||||
|
|
@ -117,6 +117,13 @@ func (t *Topology) GetVolumeLayout(collectionName string, rp *storage.ReplicaPla
|
|||
}).(*Collection).GetOrCreateVolumeLayout(rp, ttl)
|
||||
}
|
||||
|
||||
func (t *Topology) ListCollections() (ret []*Collection) {
|
||||
for _, c := range t.collectionMap.Items() {
|
||||
ret = append(ret, c.(*Collection))
|
||||
}
|
||||
return ret
|
||||
}
|
||||
|
||||
func (t *Topology) FindCollection(collectionName string) (*Collection, bool) {
|
||||
c, hasCollection := t.collectionMap.Find(collectionName)
|
||||
if !hasCollection {
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ func (mc *MasterClient) WaitUntilConnected() {
|
|||
}
|
||||
|
||||
func (mc *MasterClient) KeepConnectedToMaster() {
|
||||
glog.V(0).Infof("%s bootstraps with masters %v", mc.name, mc.masters)
|
||||
glog.V(1).Infof("%s bootstraps with masters %v", mc.name, mc.masters)
|
||||
for {
|
||||
mc.tryAllMasters()
|
||||
time.Sleep(time.Second)
|
||||
|
|
@ -52,7 +52,7 @@ func (mc *MasterClient) KeepConnectedToMaster() {
|
|||
|
||||
func (mc *MasterClient) tryAllMasters() {
|
||||
for _, master := range mc.masters {
|
||||
glog.V(0).Infof("Connecting to master %v", master)
|
||||
glog.V(1).Infof("Connecting to master %v", master)
|
||||
gprcErr := withMasterClient(context.Background(), master, mc.grpcDialOption, func(ctx context.Context, client master_pb.SeaweedClient) error {
|
||||
|
||||
stream, err := client.KeepConnected(ctx)
|
||||
|
|
@ -67,7 +67,7 @@ func (mc *MasterClient) tryAllMasters() {
|
|||
}
|
||||
|
||||
if mc.currentMaster == "" {
|
||||
glog.V(0).Infof("Connected to %v", master)
|
||||
glog.V(1).Infof("Connected to %v", master)
|
||||
mc.currentMaster = master
|
||||
}
|
||||
|
||||
|
|
|
|||
23
weed/wdclient/masterclient_collection.go
Normal file
23
weed/wdclient/masterclient_collection.go
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
package wdclient
|
||||
|
||||
import (
|
||||
"context"
|
||||
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
|
||||
)
|
||||
|
||||
func (mc *MasterClient) CollectionDelete(ctx context.Context, collection string) error {
|
||||
return withMasterClient(ctx, mc.currentMaster, mc.grpcDialOption, func(ctx context.Context, client master_pb.SeaweedClient) error {
|
||||
_, err := client.CollectionDelete(ctx, &master_pb.CollectionDeleteRequest{
|
||||
Name: collection,
|
||||
})
|
||||
return err
|
||||
})
|
||||
}
|
||||
|
||||
func (mc *MasterClient) CollectionList(ctx context.Context) (resp *master_pb.CollectionListResponse, err error) {
|
||||
err = withMasterClient(ctx, mc.currentMaster, mc.grpcDialOption, func(ctx context.Context, client master_pb.SeaweedClient) error {
|
||||
resp, err = client.CollectionList(ctx, &master_pb.CollectionListRequest{})
|
||||
return err
|
||||
})
|
||||
return
|
||||
}
|
||||
Loading…
Reference in a new issue