Skip to content

Commit 125c83a

Browse files
committed
Standardize ConfigRegionStateMachine log messages
Add a common [ConfigRegion Update] prefix to English and Chinese logs. Clarify leadership transitions and replace concatenated messages with complete templates.
1 parent eb0e3f1 commit 125c83a

3 files changed

Lines changed: 71 additions & 72 deletions

File tree

‎iotdb-core/confignode/src/main/i18n/en/org/apache/iotdb/confignode/i18n/ConfigNodeMessages.java‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,15 @@
2121

2222
public final class ConfigNodeMessages {
2323

24+
public static final String LOG_CONFIGREGION_UPDATE_CONFIGNODE_NODEID_ARG_CONSENSUSENDPOINT_ARG_IS_A_CONFIGREGION_FOLLOWER_NEW_LEADER_NODEID_ARG_STOPPING_LEADER_SERVICES_A1962CD2 =
25+
"[ConfigRegion Update] ConfigNode [nodeId: {}, consensusEndpoint: {}] is a ConfigRegion follower; new leader nodeId: {}. Stopping leader services.";
26+
public static final String LOG_CONFIGREGION_UPDATE_CONFIGNODE_NODEID_ARG_CONSENSUSENDPOINT_ARG_IS_NO_LONGER_THE_CONFIGREGION_LEADER_STOPPING_LEADER_SERVICES_5DB0DA66 =
27+
"[ConfigRegion Update] ConfigNode [nodeId: {}, consensusEndpoint: {}] is no longer the ConfigRegion leader; stopping leader services.";
28+
public static final String LOG_CONFIGREGION_UPDATE_CONFIGNODE_NODEID_ARG_CONSENSUSENDPOINT_ARG_COMPLETED_STOPPING_LEADER_SERVICES_62381EE1 =
29+
"[ConfigRegion Update] ConfigNode [nodeId: {}, consensusEndpoint: {}] completed stopping leader services.";
30+
public static final String LOG_CONFIGREGION_UPDATE_FAILED_TO_CLOSE_THE_CONFIGNODE_SIMPLECONSENSUS_LOG_FILEPATH_ARG_RETRY_ARG_188A702E =
31+
"[ConfigRegion Update] Failed to close the ConfigNode SimpleConsensus log, filePath: {}, retry: {}.";
32+
2433
public static final String ACQUIRE_TRIGGERTABLELOCK = "acquire TriggerTableLock";
2534
public static final String ACQUIRE_UDFTABLELOCK = "acquire UDFTableLock";
2635
public static final String ACTIVATING = "Activating {}...";
@@ -38,19 +47,17 @@ public final class ConfigNodeMessages {
3847
"Cannot find RegionGroup for region {} when removeRegionOldLocation in {}";
3948
public static final String CAN_ONLY_ALTER_DATATYPE_OF_FIELD_COLUMNS =
4049
"Can only alter datatype of FIELD columns";
41-
public static final String CAN_T_CLOSE_STANDALONELOG_FOR_CONFIGNODE_SIMPLECONSENSUS_MODE =
42-
"Can't close StandAloneLog for ConfigNode SimpleConsensus mode, ";
4350
public static final String CAN_T_CONNECT_TO_DATA_NODE = "Can't connect to Data node: {}";
4451
public static final String CAN_T_CONSTRUCT_CLUSTERSCHEMAINFO =
4552
"Can't construct ClusterSchemaInfo";
4653
public static final String CAN_T_DELETE_TEMPORARY_SNAPSHOT_FILE_RETRYING =
4754
"Can't delete temporary snapshot file: {}, retrying...";
4855
public static final String CAN_T_FORCE_LOGWRITER_FOR_CONFIGNODE_FLUSHWALFORSIMPLECONSENSUS =
49-
"Can't force logWriter for ConfigNode flushWALForSimpleConsensus";
56+
"[ConfigRegion Update] Can't force logWriter for ConfigNode flushWALForSimpleConsensus";
5057
public static final String CAN_T_FORCE_LOGWRITER_FOR_CONFIGNODE_SIMPLECONSENSUS_MODE =
51-
"Can't force logWriter for ConfigNode SimpleConsensus mode";
58+
"[ConfigRegion Update] Can't force logWriter for ConfigNode SimpleConsensus mode";
5259
public static final String CAN_T_SERIALIZE_CURRENT_CONFIGPHYSICALPLAN_FOR_CONFIGNODE_SIMPLECONSENSUS_MODE =
53-
"Can't serialize current ConfigPhysicalPlan for ConfigNode SimpleConsensus mode";
60+
"[ConfigRegion Update] Can't serialize current ConfigPhysicalPlan for ConfigNode SimpleConsensus mode";
5461
public static final String CAN_T_START_CONFIGNODE_CONSENSUS_GROUP =
5562
"Can't start ConfigNode consensus group!";
5663
public static final String CHANGE_REGIONS_LEADER_ERROR_ON_DATE_NODE =
@@ -96,11 +103,11 @@ public final class ConfigNodeMessages {
96103
public static final String CONFIGNODE_RPC_SERVICE_START_TO_REMOVE_DATANODE_REQ =
97104
"ConfigNode RPC Service start to remove DataNode, req: {}";
98105
public static final String CONFIGNODE_SIMPLECONSENSUSFILE_HAS_EXISTED_FILEPATH =
99-
"ConfigNode SimpleConsensusFile has existed,filePath:{}";
106+
"[ConfigRegion Update] ConfigNode SimpleConsensusFile has existed,filePath:{}";
100107
public static final String CONFIG_REGION_LISTENING_QUEUE_LISTEN_TO_SNAPSHOT_FAILED_THE_HISTORICAL =
101-
"Config Region Listening Queue Listen to snapshot failed, the historical data may not be transferred.";
108+
"[ConfigRegion Update] Config Region Listening Queue Listen to snapshot failed, the historical data may not be transferred.";
102109
public static final String CONFIG_REGION_LISTENING_QUEUE_LISTEN_TO_SNAPSHOT_FAILED_WHEN_STARTUP =
103-
"Config Region Listening Queue Listen to snapshot failed when startup, snapshot will be tried again when starting schema transferring pipes";
110+
"[ConfigRegion Update] Config Region Listening Queue Listen to snapshot failed when startup, snapshot will be tried again when starting schema transferring pipes";
104111
public static final String CONTINUOUS_QUERY_MIN_EVERY_INTERVAL_IN_MS_SHOULD_BE_GREATER =
105112
"continuous_query_min_every_interval_in_ms should be greater than 0, but current value is {}, ignore that and use the default value {}";
106113
public static final String CONTINUOUS_QUERY_SUBMIT_THREAD_SHOULD_BE_GREATER_THAN_0 =
@@ -112,18 +119,15 @@ public final class ConfigNodeMessages {
112119
public static final String CREATEREGIONGROUPS_DATABASE_HAS_BEEN_DELETED_CORRESPONDING_REGIONGROUPS =
113120
"[CreateRegionGroups] Database {} has been deleted, corresponding RegionGroups will not be created.";
114121
public static final String CREATE_CONFIGNODE_SIMPLECONSENSUSFILE =
115-
"Create ConfigNode SimpleConsensusFile: {}";
122+
"[ConfigRegion Update] Create ConfigNode SimpleConsensusFile: {}";
116123
public static final String CREATE_CONFIGNODE_SIMPLECONSENSUSFILE_FAILED_FILEPATH =
117-
"Create ConfigNode SimpleConsensusFile failed, filePath: {}";
124+
"[ConfigRegion Update] Create ConfigNode SimpleConsensusFile failed, filePath: {}";
118125
public static final String CURRENT_NODE_NODEID_IP_PORT_AS_CONFIG_REGION_LEADER_IS =
119-
"Current node [nodeId: {}, ip:port: {}] as config region leader is ready to work";
126+
"[ConfigRegion Update] ConfigNode [nodeId: {}, consensusEndpoint: {}] completed leader service startup.";
120127
public static final String CURRENT_NODE_NODEID_IP_PORT_BECOMES_CONFIG_REGION_LEADER =
121-
"Current node [nodeId: {}, ip:port: {}] becomes config region leader";
122-
public static final String CURRENT_NODE_NODEID_IP_PORT_IS_NO_LONGER_THE_LEADER =
123-
"Current node [nodeId:{}, ip:port: {}] is no longer the leader, ";
128+
"[ConfigRegion Update] ConfigNode [nodeId: {}, consensusEndpoint: {}] became the ConfigRegion leader; starting leader services.";
124129
public static final String MESSAGE_CURRENT_NODE_NODEID_ARG_IP_PORT_ARG_IS_NO_LONGER_THE_LEADER_SKIP_STARTING_LEADER_SERVICES_BECAUSE_THE_LEADER_EPOCH_IS_STALE_CCF39435 =
125-
"Current node [nodeId:{}, ip:port: {}] is no longer the leader, skip starting leader "
126-
+ "services because the leader epoch is stale";
130+
"[ConfigRegion Update] Skipping leader service startup for ConfigNode [nodeId: {}, consensusEndpoint: {}] because the leadership epoch is stale.";
127131
public static final String DATABASE_INCONSISTENCY_DETECTED_WHEN_ADJUSTING_MAX_REGION_GROUP_COUNT_MESSAGE =
128132
"Database inconsistency detected when adjusting max region group count, message: {}, will be corrected by the following adjusting plans";
129133
public static final String DATABASE_NOT_EXIST = "Database not exist";
@@ -136,7 +140,7 @@ public final class ConfigNodeMessages {
136140
public static final String DELETE_USELESS_PROCEDURE_WAL_DIR_FAIL =
137141
"Delete useless procedure wal dir fail.";
138142
public static final String DESERIALIZATION_ERROR_FOR_WRITE_PLAN_REQUEST_BYTEBUFFER =
139-
"Deserialization error for write plan, request: {}, bytebuffer: {}";
143+
"[ConfigRegion Update] Deserialization error for write plan, request: {}, bytebuffer: {}";
140144
public static final String DOES_NOT_EXIST = "%s does not exist";
141145
public static final String DROPPING_TAG_OR_TIME_COLUMN_IS_NOT_SUPPORTED =
142146
"Dropping tag or time column is not supported.";
@@ -162,8 +166,8 @@ public final class ConfigNodeMessages {
162166
"Execute getClusterId with result {}";
163167
public static final String EXECUTE_GETSYSTEMCONFIGURATION_WITH_RESULT =
164168
"Execute GetSystemConfiguration with result {}";
165-
public static final String EXECUTE_NON_QUERY_PLAN_FAILED = "Execute non-query plan failed";
166-
public static final String EXECUTE_QUERY_PLAN_FAILED = "Execute query plan failed";
169+
public static final String EXECUTE_NON_QUERY_PLAN_FAILED = "[ConfigRegion Update] Execute non-query plan failed";
170+
public static final String EXECUTE_QUERY_PLAN_FAILED = "[ConfigRegion Update] Execute query plan failed";
167171
public static final String EXECUTE_REGISTERAINODEREQUEST_WITH_RESULT =
168172
"Execute RegisterAINodeRequest {} with result {}";
169173
public static final String EXECUTE_REGISTERCONFIGNODEREQUEST_WITH_RESULT =
@@ -309,7 +313,7 @@ public final class ConfigNodeMessages {
309313
"{} has successfully started and joined the cluster: {}.";
310314
public static final String ID_TOOK_SNAPSHOT_FAIL = "{} id {} took snapshot fail";
311315
public static final String INITSTANDALONECONFIGNODE_MEETS_ERROR_CAN_T_FIND_STANDALONE_LOG_FILES_FILEPATH =
312-
"InitStandAloneConfigNode meets error, can't find standalone log files, filePath: {}";
316+
"[ConfigRegion Update] InitStandAloneConfigNode meets error, can't find standalone log files, filePath: {}";
313317
public static final String INVALID_AUTHOR_TYPE_ORDINAL = "Invalid Author Type ordinal";
314318
public static final String IOTDB_STARTED = "IoTDB started";
315319
public static final String IS_DEACTIVATED = "{} is deactivated.";
@@ -470,15 +474,15 @@ public final class ConfigNodeMessages {
470474
"The time_partition_interval should be positive";
471475
public static final String THE_TIME_PARTITION_ORIGIN_SHOULD_BE_NON_NEGATIVE =
472476
"The time_partition_origin should be non-negative";
473-
public static final String TRY_LISTEN_TO_PLAN_FAILED = "Try listen to plan failed";
477+
public static final String TRY_LISTEN_TO_PLAN_FAILED = "[ConfigRegion Update] Try listen to plan failed";
474478
public static final String UNDEFINED_TEMPLATE = "Undefined template {}";
475479
public static final String UNEXPECTED_INTERRUPTION_DURING_THE_CLOSE_METHOD_OF_LOGWRITER =
476-
"Unexpected interruption during the close method of logWriter";
480+
"[ConfigRegion Update] Unexpected interruption during the close method of logWriter";
477481
public static final String UNEXPECTED_INTERRUPTION_DURING_WAITING_FOR_LEADER_ELECTION =
478482
"Unexpected interruption during waiting for leader election.";
479-
public static final String UNEXPECTED_READ_PLAN = "Unexpected read plan : {}";
483+
public static final String UNEXPECTED_READ_PLAN = "[ConfigRegion Update] Unexpected read plan : {}";
480484
public static final String UNEXPECTED_WRITE_PLAN_REQUEST_BYTEBUFFER =
481-
"Unexpected write plan, request: {}, bytebuffer: {}";
485+
"[ConfigRegion Update] Unexpected write plan, request: {}, bytebuffer: {}";
482486
public static final String UNKNOWN_FAILURE_DETECTOR = "Unknown failure_detector: %s, please set to \"fixed\" or \"phi_accrual\"";
483487
public static final String UNKNOWN_HOST_WHEN_CHECKING_SEED_CONFIGNODE_IP =
484488
"Unknown host when checking seed configNode IP {}";
@@ -621,10 +625,6 @@ private ConfigNodeMessages() {}
621625
public static final String LOG_NO_NEED_REMOVE_IT_NODE_ARG_REGION_ARG_D14062CE = "no need to remove it, node: {}, region: {}";
622626
public static final String LOG_PID_ARG_FAILED_WRITE_UPDATE_API_EXECUTING_CONSENSUS_LAYER_824FB30E = "pid={} Failed in the write update API executing the consensus layer due to: ";
623627
public static final String LOG_PID_ARG_FAILED_WRITE_DELETE_API_EXECUTING_CONSENSUS_LAYER_0E758BF5 = "pid={} Failed in the write delete API executing the consensus layer due to: ";
624-
public static final String LOG_NEW_LEADER_NODEID_ARG_0A63760B = "the new leader is [nodeId:{}]";
625-
public static final String LOG_START_CLEANING_UP_RELATED_SERVICES_A409E261 = "start cleaning up related services";
626-
public static final String LOG_ALL_SERVICES_OLD_LEADER_UNAVAILABLE_NOW_8A22E60F = "all services on old leader are unavailable now.";
627-
public static final String LOG_FILEPATH_ARG_RETRY_ARG_16284354 = "filePath: {}, retry: {}";
628628
public static final String EXCEPTION_COLON_5D70AD09 = ":";
629629
public static final String MESSAGE_COLON_CEFF3F4D = ": ";
630630
public static final String EMPTY_MESSAGE = "";
@@ -633,16 +633,16 @@ private ConfigNodeMessages() {}
633633
public static final String MESSAGE_CURRENT_CONFIGNODE_NODEID_ARG_IP_ARG_FAILED_TO_START_LEADER_SERVICE_ARG_THE_1754011A =
634634
"Current ConfigNode(nodeId: {}, ip: {}) failed to start leader service [{}], the";
635635
public static final String MESSAGE_CURRENT_CONFIGNODE_NODEID_ARG_IP_ARG_FAILED_TO_START_LEADER_SERVICE_ARG_THE_NODE_WILL_STILL_FINISH_WARMING_UP_THIS_SERVICE_STAYS_UNAVAILABLE_UNTIL_THE_NEXT_LEADERSHIP_TRANSITION_E89A98E7 =
636-
"Current ConfigNode(nodeId: {}, ip: {}) failed to start leader service [{}], the node will "
636+
"[ConfigRegion Update] Current ConfigNode(nodeId: {}, ip: {}) failed to start leader service [{}], the node will "
637637
+ "still finish warming up; this service stays unavailable until the next leadership "
638638
+ "transition.";
639639
public static final String MESSAGE_CURRENT_CONFIGNODE_NODEID_ARG_IP_ARG_FINISHED_STARTING_LEADER_SERVICES_WHILE_LOAD_0C57A408 =
640640
"Current ConfigNode(nodeId: {}, ip: {}) finished starting leader services while load";
641641
public static final String MESSAGE_CURRENT_CONFIGNODE_NODEID_ARG_IP_ARG_FINISHED_STARTING_LEADER_SERVICES_WHILE_LOAD_WARM_UP_IS_STILL_IN_PROGRESS_ARG_17C09A31 =
642-
"Current ConfigNode(nodeId: {}, ip: {}) finished starting leader services while load warm-up "
642+
"[ConfigRegion Update] Current ConfigNode(nodeId: {}, ip: {}) finished starting leader services while load warm-up "
643643
+ "is still in progress: {}";
644644
public static final String MESSAGE_UNEXPECTED_INTERRUPTION_WHILE_WAITING_FOR_CONFIGNODE_LEADER_LOAD_WARM_UP_BB5AA4F7 =
645-
"Unexpected interruption while waiting for ConfigNode leader load warm-up.";
645+
"[ConfigRegion Update] Unexpected interruption while waiting for ConfigNode leader load warm-up.";
646646
public static final String EXCEPTION_PROCEDURE_FILE_ARG_EXCEEDS_THE_LOAD_BUFFER_LIMIT_ARG_ACTUAL_SIZE_ARG_62375B4C =
647647
"Procedure file %s exceeds the load buffer limit %s, actual size %s";
648648
public static final String MESSAGE_CONFIGNODE_LEADER_IS_WARMING_UP_BEFORE_SERVING_THE_REGISTERING_CONFIGNODE_WILL_WAIT_2E051639 =

0 commit comments

Comments
 (0)