Merge accumulated changes related to message queue (#5098)

* balance partitions on brokers * prepare topic partition first and then publish, move partition * purge unused APIs * clean up * adjust logs * add BalanceTopics() grpc API * configure topic * configure topic command * refactor * repair missing partitions * sequence of operations to ensure ordering * proto to close publishers and consumers * rename file * topic partition versioned by unixTimeNs * create local topic partition * close publishers * randomize the client name * wait until no publishers * logs * close stop publisher channel * send last ack * comments * comment * comments * support list of brokers * add cli options * Update .gitignore * logs * return io.eof directly * refactor * optionally create topic * refactoring * detect consumer disconnection * sub client wait for more messages * subscribe by time stamp * rename * rename to sub_balancer * rename * adjust comments * rename * fix compilation * rename * rename * SubscriberToSubCoordinator * sticky rebalance * go fmt * add tests * balance partitions on brokers * prepare topic partition first and then publish, move partition * purge unused APIs * clean up * adjust logs * add BalanceTopics() grpc API * configure topic * configure topic command * refactor * repair missing partitions * sequence of operations to ensure ordering * proto to close publishers and consumers * rename file * topic partition versioned by unixTimeNs * create local topic partition * close publishers * randomize the client name * wait until no publishers * logs * close stop publisher channel * send last ack * comments * comment * comments * support list of brokers * add cli options * Update .gitignore * logs * return io.eof directly * refactor * optionally create topic * refactoring * detect consumer disconnection * sub client wait for more messages * subscribe by time stamp * rename * rename to sub_balancer * rename * adjust comments * rename * fix compilation * rename * rename * SubscriberToSubCoordinator * sticky rebalance * go fmt * add tests * tracking topic=>broker * merge * comment
2023-12-11 12:05:54 -08:00
parent 8784553501
commit 580940bf82
58 changed files with 3853 additions and 2752 deletions
--- a/weed/mq/pub_balancer/balance_brokers_test.go
+++ b/weed/mq/pub_balancer/balance_brokers_test.go
@@ -0,0 +1,75 @@
+package pub_balancer
+
+import (
+	cmap "github.com/orcaman/concurrent-map/v2"
+	"github.com/seaweedfs/seaweedfs/weed/mq/topic"
+	"reflect"
+	"testing"
+)
+
+func TestBalanceTopicPartitionOnBrokers(t *testing.T) {
+
+	brokers := cmap.New[*BrokerStats]()
+	broker1Stats := &BrokerStats{
+		TopicPartitionCount: 1,
+		ConsumerCount:       1,
+		CpuUsagePercent:     1,
+		TopicPartitionStats: cmap.New[*TopicPartitionStats](),
+	}
+	broker1Stats.TopicPartitionStats.Set("topic1:0", &TopicPartitionStats{
+		TopicPartition: topic.TopicPartition{
+			Topic:     topic.Topic{Namespace: "topic1", Name: "topic1"},
+			Partition: topic.Partition{RangeStart: 0, RangeStop: 512, RingSize: 1024},
+		},
+		ConsumerCount: 1,
+		IsLeader:      true,
+	})
+	broker2Stats := &BrokerStats{
+		TopicPartitionCount: 2,
+		ConsumerCount:       1,
+		CpuUsagePercent:     1,
+		TopicPartitionStats: cmap.New[*TopicPartitionStats](),
+	}
+	broker2Stats.TopicPartitionStats.Set("topic1:1", &TopicPartitionStats{
+		TopicPartition: topic.TopicPartition{
+			Topic:     topic.Topic{Namespace: "topic1", Name: "topic1"},
+			Partition: topic.Partition{RangeStart: 512, RangeStop: 1024, RingSize: 1024},
+		},
+		ConsumerCount: 1,
+		IsLeader:      true,
+	})
+	broker2Stats.TopicPartitionStats.Set("topic2:0", &TopicPartitionStats{
+		TopicPartition: topic.TopicPartition{
+			Topic:     topic.Topic{Namespace: "topic2", Name: "topic2"},
+			Partition: topic.Partition{RangeStart: 0, RangeStop: 1024, RingSize: 1024},
+		},
+		ConsumerCount: 1,
+		IsLeader:      true,
+	})
+	brokers.Set("broker1", broker1Stats)
+	brokers.Set("broker2", broker2Stats)
+
+	type args struct {
+		brokers cmap.ConcurrentMap[string, *BrokerStats]
+	}
+	tests := []struct {
+		name string
+		args args
+		want BalanceAction
+	}{
+		{
+			name: "test",
+			args: args{
+				brokers: brokers,
+			},
+			want: nil,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := BalanceTopicPartitionOnBrokers(tt.args.brokers); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("BalanceTopicPartitionOnBrokers() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}