Repository: vanus-labs/vanus
Pull request #521 (2023-03-11 11:53:22)

fix: revert unexpected change of ID
<!--

Thank you for contributing to Vanus!

PR Title Format: 

feat/fix/refactor/docs/...: what's changed

Note: see https://github.com/vanus-labs/vanus/blob/main/CONTRIBUTING.md to know details about title format

-->

### What problem does this PR solve?

<!--

Please create an issue first to describe the problem

There MUST be one line starting with "Issue Number:  ".

-->

Issue Number: None

### Problem Summary

### What is changed and how does it work?

### Check List

<!-- At least one of them must be included. -->

#### Tests

- [ ] Unit test
- [ ] Integration test
- [ ] Manual test (add detailed scripts or steps below)
- [ ] No code



Patch:
diff --git a/internal/controller/eventbus/controller.go b/internal/controller/eventbus/controller.go
index 640e4f2..560b8ba 100644
--- a/internal/controller/eventbus/controller.go
+++ b/internal/controller/eventbus/controller.go
@@ -94,8 +94,9 @@ type controller struct {
 	eventbusDeletedCount int64
 }
 
-func (ctrl *controller) GetEventbusWithHumanFriendly(ctx context.Context,
-	request *ctrlpb.GetEventbusWithHumanFriendlyRequest) (*metapb.Eventbus, error) {
+func (ctrl *controller) GetEventbusWithHumanFriendly(
+	ctx context.Context, request *ctrlpb.GetEventbusWithHumanFriendlyRequest,
+) (*metapb.Eventbus, error) {
 	for id, eventbus := range ctrl.eventbusMap {
 		if eventbus.Name == request.EventbusName {
 			return ctrl.getEventbus(id)
@@ -204,7 +205,7 @@ func (ctrl *controller) createEventbus(
 
 	id, err := vanus.NewID()
 	if err != nil {
-		log.Warning(ctx, "failed to create eventbus VolumeID", map[string]interface{}{
+		log.Warning(ctx, "failed to create eventbus ID", map[string]interface{}{
 			log.KeyError: err,
 		})
 		return nil, err
diff --git a/internal/controller/eventbus/eventlog/eventlog.go b/internal/controller/eventbus/eventlog/eventlog.go
index 7dcd458..e214708 100644
--- a/internal/controller/eventbus/eventlog/eventlog.go
+++ b/internal/controller/eventbus/eventlog/eventlog.go
@@ -172,7 +172,7 @@ func (mgr *eventlogManager) AcquireEventlog(
 
 	id, err := vanus.NewID()
 	if err != nil {
-		log.Warning(ctx, "failed to create eventlog VolumeID", map[string]interface{}{
+		log.Warning(ctx, "failed to create eventlog ID", map[string]interface{}{
 			log.KeyError:  err,
 			"eventbus_id": eventbusID,
 		})
@@ -831,14 +831,14 @@ func (mgr *eventlogManager) generateSegment(ctx context.Context, el *eventlog) (
 
 	id1, err := vanus.NewID()
 	if err != nil {
-		log.Warning(ctx, "failed to create segment VolumeID", map[string]interface{}{
+		log.Warning(ctx, "failed to create segment ID", map[string]interface{}{
 			log.KeyError: err,
 		})
 		return nil, err
 	}
 	id2, err := vanus.NewID()
 	if err != nil {
-		log.Warning(ctx, "failed to create raft replica VolumeID", map[string]interface{}{
+		log.Warning(ctx, "failed to create raft replica ID", map[string]interface{}{
 			log.KeyError: err,
 		})
 		return nil, err
diff --git a/internal/controller/eventbus/server/mock_instance.go b/internal/controller/eventbus/server/mock_instance.go
index 88f5ed1..5473c5b 100644
--- a/internal/controller/eventbus/server/mock_instance.go
+++ b/internal/controller/eventbus/server/mock_instance.go
@@ -124,7 +124,7 @@ func (mr *MockInstanceMockRecorder) GetServer() *gomock.Call {
 // ID mocks base method.
 func (m *MockInstance) ID() vanus.ID {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "VolumeID")
+	ret := m.ctrl.Call(m, "ID")
 	ret0, _ := ret[0].(vanus.ID)
 	return ret0
 }
@@ -132,7 +132,7 @@ func (m *MockInstance) ID() vanus.ID {
 // ID indicates an expected call of ID.
 func (mr *MockInstanceMockRecorder) ID() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VolumeID", reflect.TypeOf((*MockInstance)(nil).ID))
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ID", reflect.TypeOf((*MockInstance)(nil).ID))
 }
 
 // SetServer mocks base method.
diff --git a/internal/controller/trigger/storage/offset.go b/internal/controller/trigger/storage/offset.go
index deace89..c4020d4 100644
--- a/internal/controller/trigger/storage/offset.go
+++ b/internal/controller/trigger/storage/offset.go
@@ -59,7 +59,7 @@ func (s *offsetStorage) getSubKey(subscriptionID vanus.ID) string {
 func (s *offsetStorage) int64ToByteArr(v uint64) []byte {
 	/*
 		b := make([]byte, 8)
-		binary.LittleEndian.PutUint64(b, vanus.VolumeID(v))
+		binary.LittleEndian.PutUint64(b, vanus.ID(v))
 		return b
 	*/
 	str := strconv.FormatUint(v, base)
@@ -68,7 +68,7 @@ func (s *offsetStorage) int64ToByteArr(v uint64) []byte {
 
 func (s *offsetStorage) byteArrToUint64(b []byte) uint64 {
 	/*
-		v := binary.LittleEndian.vanus.VolumeID(b)
+		v := binary.LittleEndian.vanus.ID(b)
 		return int64(v)
 	*/
 	v, _ := strconv.ParseUint(string(b), base, bitSize)
diff --git a/internal/store/block/raw/engine.go b/internal/store/block/raw/engine.go
index a2359b1..5665f90 100644
--- a/internal/store/block/raw/engine.go
+++ b/internal/store/block/raw/engine.go
@@ -40,7 +40,7 @@ type Engine interface {
 	Recover(ctx context.Context) (map[vanus.ID]block.Raw, error)
 
 	Create(ctx context.Context, id vanus.ID, capacity int64) (block.Raw, error)
-	// Open(ctx context.Context, id vanus.VolumeID) (block.Raw, error)
+	// Open(ctx context.Context, id vanus.ID) (block.Raw, error)
 }
 
 var engines = map[string]Engine{}
diff --git a/internal/store/raft/block/appender.go b/internal/store/raft/block/appender.go
index 89bc098..0b05607 100644
--- a/internal/store/raft/block/appender.go
+++ b/internal/store/raft/block/appender.go
@@ -151,7 +151,7 @@ func (a *appender) persistHardState(ctx context.Context, hs raftpb.HardState) {
 
 func (a *appender) persistEntries(ctx context.Context, entries []raftpb.Entry) {
 	// log.Debug(ctx, "Append entries to raft log.", map[string]interface{}{
-	// 	"node_id":        a.VolumeID(),
+	// 	"node_id":        a.ID(),
 	// 	"appended_index": entries[0].Index,
 	// 	"entries_num":    len(entries),
 	// })
@@ -172,7 +172,7 @@ func (a *appender) persistEntries(ctx context.Context, entries []raftpb.Entry) {
 
 func (a *appender) compactLog(ctx context.Context, index uint64) {
 	// log.Debug(ctx, "Compact raft log.", map[string]interface{}{
-	// 	"node_id": a.VolumeID(),
+	// 	"node_id": a.ID(),
 	// 	"index":   index,
 	// })
 
@@ -198,7 +198,7 @@ func (a *appender) applyEntries(ctx context.Context, committedEntries []raftpb.E
 		// FIXME(james.yin): do not pass frag with nil value?
 		a.raw.CommitAppend(ctx, frag, func() {
 			// log.Debug(ctx, "Store applied offset.", map[string]interface{}{
-			// 	"node_id":        a.VolumeID(),
+			// 	"node_id":        a.ID(),
 			// 	"applied_offset": index,
 			// })
 			a.onAppend(ctx, index)
diff --git a/internal/store/raft/storage/log_storage.go b/internal/store/raft/storage/log_storage.go
index 6b52dc4..5893995 100644
--- a/internal/store/raft/storage/log_storage.go
+++ b/internal/store/raft/storage/log_storage.go
@@ -377,7 +377,7 @@ func (s *Storage) prepareAppend(ctx context.Context, entries []raftpb.Entry) err
 func (s *Storage) marshalEntries(entries []raftpb.Entry) ([][]byte, error) {
 	ents := make([][]byte, len(entries))
 	for i, entry := range entries {
-		// reset node VolumeID.
+		// reset node ID.
 		entry.NodeId = s.nodeID.Uint64()
 		ent, err := entry.Marshal()
 		if err != nil {
diff --git a/internal/store/segment/server.go b/internal/store/segment/server.go
index 1ea888b..7f5d2b1 100644
--- a/internal/store/segment/server.go
+++ b/internal/store/segment/server.go
@@ -81,7 +81,7 @@ type Server interface {
 
 	CreateBlock(ctx context.Context, id vanus.ID, size int64) error
 	RemoveBlock(ctx context.Context, id vanus.ID) error
-	// GetBlockInfo(ctx context.Context, id vanus.VolumeID) error
+	// GetBlockInfo(ctx context.Context, id vanus.ID) error
 
 	ActivateSegment(ctx context.Context, logID vanus.ID, segID vanus.ID, replicas map[vanus.ID]string) error
 	InactivateSegment(ctx context.Context) error
@@ -453,7 +453,7 @@ func (s *server) RemoveBlock(ctx context.Context, blockID vanus.ID) error {
 }
 
 // TODO(james.yin): implements GetBlockInfo.
-// func (s *server) GetBlockInfo(ctx context.Context, id vanus.VolumeID) error {
+// func (s *server) GetBlockInfo(ctx context.Context, id vanus.ID) error {
 // 	if err := s.checkState(); err != nil {
 // 		return err
 // 	}
diff --git a/proto/proto/controller.proto b/proto/proto/controller.proto
index 5953914..4628f2f 100644
--- a/proto/proto/controller.proto
+++ b/proto/proto/controller.proto
@@ -107,7 +107,7 @@ message QuerySegmentRouteInfoRequest {}
 message QuerySegmentRouteInfoResponse {}
 
 message SegmentHeartbeatRequest {
-  reserved 1; // deprecated server_id(uint_64) at v0.7.0
+  reserved 1; // server_id(uint_64) has been removed at v0.7.0
   uint64 volume_id = 2;
   repeated meta.SegmentHealthInfo health_info = 3;
   string report_time = 4;
@@ -123,13 +123,13 @@ message RegisterSegmentServerRequest {
 }
 
 message RegisterSegmentServerResponse {
-  reserved 1; // deprecated server_id(uint_64) at v0.7.0
+  reserved 1; // server_id(uint_64) has been removed at v0.7.0
   map<uint64, meta.Segment> segments = 2;
   uint64 volume_id = 3;
 }
 
 message UnregisterSegmentServerRequest {
-  reserved 1; // deprecated server_id(uint_64) at v0.7.0
+  reserved 1; // server_id(uint_64) has been removed at v0.7.0
   string address = 2;
   uint64 volume_id = 3;
 }
diff --git a/proto/proto/segment.proto b/proto/proto/segment.proto
index 699a9c5..4b4ca07 100644
--- a/proto/proto/segment.proto
+++ b/proto/proto/segment.proto
@@ -42,7 +42,7 @@ service SegmentServer {
 
 message StartSegmentServerRequest {
   config.ServerConfig config = 1;
-  reserved 2; // deprecated server_id(uint_64) at v0.7.0
+  reserved 2; // server_id(uint_64) has been removed at v0.7.0
 }
 
 message StartSegmentServerResponse {}
diff --git a/raft/confchange/confchange.go b/raft/confchange/confchange.go
index f019dc7..0ac08d7 100644
--- a/raft/confchange/confchange.go
+++ b/raft/confchange/confchange.go
@@ -175,7 +175,7 @@ func (c Changer) apply(cfg *tracker.Config, prs tracker.ProgressMap, ccs ...pb.C
 	return nil
 }
 
-// makeVoter adds or promotes the given VolumeID to be a voter in the incoming
+// makeVoter adds or promotes the given ID to be a voter in the incoming
 // majority config.
 func (c Changer) makeVoter(cfg *tracker.Config, prs tracker.ProgressMap, id uint64) {
 	pr := prs[id]
@@ -190,7 +190,7 @@ func (c Changer) makeVoter(cfg *tracker.Config, prs tracker.ProgressMap, id uint
 	incoming(cfg.Voters)[id] = struct{}{}
 }
 
-// makeLearner makes the given VolumeID a learner or stages it to be a learner once
+// makeLearner makes the given ID a learner or stages it to be a learner once
 // an active joint configuration is exited.
 //
 // The former happens when the peer is not a part of the outgoing config, in
diff --git a/raft/doc.go b/raft/doc.go
index ad182b9..d491352 100644
--- a/raft/doc.go
+++ b/raft/doc.go
@@ -34,14 +34,14 @@ To start a node from scratch:
 
   storage := raft.NewMemoryStorage()
   c := &Config{
-    VolumeID:              0x01,
+    ID:              0x01,
     ElectionTick:    10,
     HeartbeatTick:   1,
     Storage:         storage,
     MaxSizePerMsg:   4096,
     MaxInflightMsgs: 256,
   }
-  n := raft.StartNode(c, []raft.Peer{{VolumeID: 0x02}, {VolumeID: 0x03}})
+  n := raft.StartNode(c, []raft.Peer{{ID: 0x02}, {ID: 0x03}})
 
 To restart a node from previous state:
 
@@ -54,7 +54,7 @@ To restart a node from previous state:
   storage.Append(entries)
 
   c := &Config{
-    VolumeID:              0x01,
+    ID:              0x01,
     ElectionTick:    10,
     HeartbeatTick:   1,
     Storage:         storage,
@@ -164,8 +164,8 @@ raftpb.EntryConfChange will be returned. You must apply it to node through:
 	cc.Unmarshal(data)
 	n.ApplyConfChange(cc)
 
-Note: An VolumeID represents a unique node in a cluster for all time. A
-given VolumeID MUST be used only once even if the old node has been removed.
+Note: An ID represents a unique node in a cluster for all time. A
+given ID MUST be used only once even if the old node has been removed.
 This means that for example IP addresses make poor node IDs since they
 may be reused. Node IDs must be non-zero.
 
@@ -223,7 +223,7 @@ stale log entries:
 	to its log, and then calls 'bcastAppend' method to send those entries to
 	its peers. When passed to candidate, 'MsgProp' is dropped. When passed to
 	follower, 'MsgProp' is stored in follower's mailbox(msgs) by the send
-	method. It is stored with sender's VolumeID and later forwarded to leader by
+	method. It is stored with sender's ID and later forwarded to leader by
 	rafthttp package.
 
 	'MsgApp' contains log entries to replicate. A leader calls bcastAppend,
@@ -282,7 +282,7 @@ stale log entries:
 	reverts back to follower and updates its committed index from the one in
 	this heartbeat. And it sends the message to its mailbox. When
 	'MsgHeartbeat' is passed to follower's Step method and message's term is
-	higher than follower's, the follower updates its leaderID with the VolumeID
+	higher than follower's, the follower updates its leaderID with the ID
 	from the message.
 
 	'MsgHeartbeatResp' is a response to 'MsgHeartbeat'. When 'MsgHeartbeatResp'
diff --git a/raft/node.go b/raft/node.go
index 46edcff..d026e7b 100644
--- a/raft/node.go
+++ b/raft/node.go
@@ -184,7 +184,7 @@ type Node interface {
 	Status() Status
 	// ReportUnreachable reports the given node is not reachable for the last send.
 	ReportUnreachable(id uint64)
-	// ReportSnapshot reports the status of the sent snapshot. The id is the raft VolumeID of the follower
+	// ReportSnapshot reports the status of the sent snapshot. The id is the raft ID of the follower
 	// who is meant to receive the snapshot, and the status is SnapshotFinish or SnapshotFailure.
 	// Calling ReportSnapshot with SnapshotFinish is a no-op. But, any failure in applying a
 	// snapshot (for e.g., while streaming it from leader to follower), should be reported to the
diff --git a/raft/quorum/majority.go b/raft/quorum/majority.go
index 91e8521..8858a36 100644
--- a/raft/quorum/majority.go
+++ b/raft/quorum/majority.go
@@ -81,7 +81,7 @@ func (c MajorityConfig) Describe(l AckedIndexer) string {
 		}
 	}
 
-	// Sort by VolumeID.
+	// Sort by ID.
 	sort.Slice(info, func(i, j int) bool {
 		return info[i].id < info[j].id
 	})
diff --git a/raft/quorum/quorum.go b/raft/quorum/quorum.go
index c9b24b8..2899e46 100644
--- a/raft/quorum/quorum.go
+++ b/raft/quorum/quorum.go
@@ -29,7 +29,7 @@ func (i Index) String() string {
 	return strconv.FormatUint(uint64(i), 10)
 }
 
-// AckedIndexer allows looking up a commit index for a given VolumeID of a voter
+// AckedIndexer allows looking up a commit index for a given ID of a voter
 // from a corresponding MajorityConfig.
 type AckedIndexer interface {
 	AckedIndex(voterID uint64) (idx Index, found bool)
diff --git a/raft/raft.go b/raft/raft.go
index 4274d10..7e57ac9 100644
--- a/raft/raft.go
+++ b/raft/raft.go
@@ -31,7 +31,7 @@ import (
 	"github.com/vanus-labs/vanus/raft/tracker"
 )
 
-// None is a placeholder node VolumeID used when there is no leader.
+// None is a placeholder node ID used when there is no leader.
 const (
 	None    uint64 = 0
 	noLimit        = math.MaxUint64
diff --git a/raft/raftpb/raft.pb.go b/raft/raftpb/raft.pb.go
index ce551f8..66ae173 100644
--- a/raft/raftpb/raft.pb.go
+++ b/raft/raftpb/raft.pb.go
@@ -2781,7 +2781,7 @@ func (m *ConfChange) Unmarshal(dAtA []byte) error {
 		switch fieldNum {
 		case 1:
 			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field VolumeID", wireType)
+				return fmt.Errorf("proto: wrong wireType = %d for field ID", wireType)
 			}
 			m.ID = 0
 			for shift := uint(0); ; shift += 7 {
diff --git a/raft/status.go b/raft/status.go
index d33aa8c..e4781d5 100644
--- a/raft/status.go
+++ b/raft/status.go
@@ -76,7 +76,7 @@ func getStatus(r *raft) Status {
 }
 
 // MarshalJSON translates the raft status into JSON.
-// TODO: try to simplify this by introducing VolumeID type into raft
+// TODO: try to simplify this by introducing ID type into raft
 func (s Status) MarshalJSON() ([]byte, error) {
 	j := fmt.Sprintf(`{"id":"%x","term":%d,"vote":"%x","commit":%d,"lead":"%x","raftState":%q,"applied":%d,"progress":{`,
 		s.ID, s.Term, s.Vote, s.Commit, s.Lead, s.RaftState, s.Applied)
diff --git a/vsctl/command/event.go b/vsctl/command/event.go
index bbeb138..4058ac2 100644
--- a/vsctl/command/event.go
+++ b/vsctl/command/event.go
@@ -345,7 +345,7 @@ func getEventCommand() *cobra.Command {
 	cmd.Flags().Int64Var(&offset, "offset", 0, "which position you want to start get")
 	cmd.Flags().Int16Var(&number, "number", 1, "the number of event you want to get")
 	cmd.Flags().Uint64Var(&eventlogID, "eventlog", 0, "get events from a specified eventlog")
-	cmd.Flags().StringVar(&eventID, "event-id", "", "get event by event VolumeID")
+	cmd.Flags().StringVar(&eventID, "event-id", "", "get event by event ID")
 	return cmd
 }
 


Test patch:
diff --git a/internal/controller/eventbus/eventlog/eventlog_test.go b/internal/controller/eventbus/eventlog/eventlog_test.go
index 4efbc29..85ac2af 100644
--- a/internal/controller/eventbus/eventlog/eventlog_test.go
+++ b/internal/controller/eventbus/eventlog/eventlog_test.go
@@ -744,7 +744,7 @@ func TestEventlogManager_UpdateSegment(t *testing.T) {
 				md.ID.String(): {updateSegment1},
 			})
 
-			// segment doesn't need to be updated because VolumeID is nil
+			// segment doesn't need to be updated because ID is nil
 			utMgr.UpdateSegment(ctx, map[string][]Segment{
 				md.ID.String(): {
 					{
diff --git a/internal/store/block/raw/engine_test.go b/internal/store/block/raw/engine_test.go
index d63c10f..114800b 100644
--- a/internal/store/block/raw/engine_test.go
+++ b/internal/store/block/raw/engine_test.go
@@ -49,7 +49,7 @@ package raw
 // 		So(err, ShouldBeNil)
 // 		So(info.Size(), ShouldEqual, defaultCapacity)
 
-// 		So(b.VolumeID(), ShouldEqual, id)
+// 		So(b.ID(), ShouldEqual, id)
 // 		So(b.Path(), ShouldEqual, path)
 // 		So(b.full(), ShouldBeFalse)
 // 		So(b.Appendable(), ShouldBeTrue)
@@ -95,7 +95,7 @@ package raw
 // 				b, err := Open(context.Background(), path)
 // 				So(err, ShouldBeNil)
 
-// 				So(b.VolumeID(), ShouldEqual, id)
+// 				So(b.ID(), ShouldEqual, id)
 // 				So(b.Path(), ShouldEqual, path)
 // 				So(b.full(), ShouldBeFalse)
 // 				So(b.Appendable(), ShouldBeTrue)
diff --git a/internal/store/block/testing/mock_block.go b/internal/store/block/testing/mock_block.go
index 025cfa7..cb9656f 100644
--- a/internal/store/block/testing/mock_block.go
+++ b/internal/store/block/testing/mock_block.go
@@ -162,7 +162,7 @@ func (mr *MockBlockMockRecorder) Append(ctx, entries, cb interface{}) *gomock.Ca
 // ID mocks base method.
 func (m *MockBlock) ID() vanus.ID {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "VolumeID")
+	ret := m.ctrl.Call(m, "ID")
 	ret0, _ := ret[0].(vanus.ID)
 	return ret0
 }
@@ -170,7 +170,7 @@ func (m *MockBlock) ID() vanus.ID {
 // ID indicates an expected call of ID.
 func (mr *MockBlockMockRecorder) ID() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VolumeID", reflect.TypeOf((*MockBlock)(nil).ID))
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ID", reflect.TypeOf((*MockBlock)(nil).ID))
 }
 
 // Read mocks base method.
diff --git a/internal/store/vsb/engine_recover_test.go b/internal/store/vsb/engine_recover_test.go
index 7649826..e742def 100644
--- a/internal/store/vsb/engine_recover_test.go
+++ b/internal/store/vsb/engine_recover_test.go
@@ -58,7 +58,7 @@ package vsb
 // 				So(err, ShouldBeNil)
 // 				So(info.Size(), ShouldEqual, defaultCapacity)
 
-// 				So(b.VolumeID(), ShouldEqual, id)
+// 				So(b.ID(), ShouldEqual, id)
 // 				So(b.Path(), ShouldEqual, path)
 // 				So(b.full(), ShouldBeFalse)
 // 				So(b.Appendable(), ShouldBeTrue)
diff --git a/internal/trigger/filter/suffix_filter_test.go b/internal/trigger/filter/suffix_filter_test.go
index 0eb7742..8f020e6 100644
--- a/internal/trigger/filter/suffix_filter_test.go
+++ b/internal/trigger/filter/suffix_filter_test.go
@@ -39,7 +39,7 @@ func TestSuffixFilter(t *testing.T) {
 	})
 	Convey("suffix filter pass", t, func() {
 		f := filter.NewSuffixFilter(map[string]string{
-			"id":     "VolumeID",
+			"id":     "ID",
 			"source": "Source",
 		})
 		result := f.Filter(event)
diff --git a/internal/trigger/filter/trigger_filter_test.go b/internal/trigger/filter/trigger_filter_test.go
index 2055fe6..8e77285 100644
--- a/internal/trigger/filter/trigger_filter_test.go
+++ b/internal/trigger/filter/trigger_filter_test.go
@@ -59,7 +59,7 @@ func TestGetFilter(t *testing.T) {
 	})
 	filters = append(filters, &primitive.SubscriptionFilter{
 		Suffix: map[string]string{
-			"id": "VolumeID",
+			"id": "ID",
 		},
 	})
 	filters = append(filters, &primitive.SubscriptionFilter{
diff --git a/raft/rafttest/interaction_env_handler_add_nodes.go b/raft/rafttest/interaction_env_handler_add_nodes.go
index 7e77782..b06b5fc 100644
--- a/raft/rafttest/interaction_env_handler_add_nodes.go
+++ b/raft/rafttest/interaction_env_handler_add_nodes.go
@@ -109,7 +109,7 @@ func (env *InteractionEnv) AddNodes(n int, snap pb.Snapshot) error {
 			if cfg.ID != id {
 				// This could be supported but then we need to do more work
 				// translating back and forth -- not worth it.
-				return errors.New("OnConfig must not change the VolumeID")
+				return errors.New("OnConfig must not change the ID")
 			}
 		}
 		if cfg.Logger != nil {
diff --git a/test/benchmark/command/component.go b/test/benchmark/command/component.go
index d689e07..9044823 100644
--- a/test/benchmark/command/component.go
+++ b/test/benchmark/command/component.go
@@ -235,7 +235,7 @@ func sendCommand() *cobra.Command {
 				br := BlockRecord{}
 				_ = json.Unmarshal([]byte(sCmd.Val()), &br)
 				brs[i] = br
-				fmt.Printf("found a block, VolumeID: %s, addr: %s\n",
+				fmt.Printf("found a block, ID: %s, addr: %s\n",
 					vanus.ID(br.LeaderID).String(), br.LeaderAddr)
 			}