|
@ -5,6 +5,7 @@ import ( |
|
|
"fmt" |
|
|
"fmt" |
|
|
"github.com/seaweedfs/seaweedfs/weed/glog" |
|
|
"github.com/seaweedfs/seaweedfs/weed/glog" |
|
|
"github.com/seaweedfs/seaweedfs/weed/mq/pub_balancer" |
|
|
"github.com/seaweedfs/seaweedfs/weed/mq/pub_balancer" |
|
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/mq/schema" |
|
|
"github.com/seaweedfs/seaweedfs/weed/mq/topic" |
|
|
"github.com/seaweedfs/seaweedfs/weed/mq/topic" |
|
|
"github.com/seaweedfs/seaweedfs/weed/pb" |
|
|
"github.com/seaweedfs/seaweedfs/weed/pb" |
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/mq_pb" |
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/mq_pb" |
|
@ -27,6 +28,14 @@ func (b *MessageQueueBroker) ConfigureTopic(ctx context.Context, request *mq_pb. |
|
|
return resp, err |
|
|
return resp, err |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// validate the schema
|
|
|
|
|
|
if request.RecordType != nil { |
|
|
|
|
|
if _, err = schema.NewSchema(request.RecordType); err != nil { |
|
|
|
|
|
return nil, status.Errorf(codes.InvalidArgument, "invalid record type %+v: %v", request.RecordType, err) |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
t := topic.FromPbTopic(request.Topic) |
|
|
t := topic.FromPbTopic(request.Topic) |
|
|
var readErr, assignErr error |
|
|
var readErr, assignErr error |
|
|
resp, readErr = b.readTopicConfFromFiler(t) |
|
|
resp, readErr = b.readTopicConfFromFiler(t) |
|
@ -56,6 +65,7 @@ func (b *MessageQueueBroker) ConfigureTopic(ctx context.Context, request *mq_pb. |
|
|
return nil, status.Errorf(codes.Unavailable, pub_balancer.ErrNoBroker.Error()) |
|
|
return nil, status.Errorf(codes.Unavailable, pub_balancer.ErrNoBroker.Error()) |
|
|
} |
|
|
} |
|
|
resp.BrokerPartitionAssignments = pub_balancer.AllocateTopicPartitions(b.Balancer.Brokers, request.PartitionCount) |
|
|
resp.BrokerPartitionAssignments = pub_balancer.AllocateTopicPartitions(b.Balancer.Brokers, request.PartitionCount) |
|
|
|
|
|
resp.RecordType = request.RecordType |
|
|
|
|
|
|
|
|
// save the topic configuration on filer
|
|
|
// save the topic configuration on filer
|
|
|
if err := b.saveTopicConfToFiler(request.Topic, resp); err != nil { |
|
|
if err := b.saveTopicConfToFiler(request.Topic, resp); err != nil { |
|
|