You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by xi...@apache.org on 2020/08/20 00:05:51 UTC
[incubator-pinot] branch master updated: Fixing the race condition
that segment finished before ControllerLeaderLocator created. (#5864)
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new c5a8b02 Fixing the race condition that segment finished before ControllerLeaderLocator created. (#5864)
c5a8b02 is described below
commit c5a8b02a491d22454174bcbb07927a90a339ec9e
Author: Xiang Fu <fx...@gmail.com>
AuthorDate: Wed Aug 19 17:05:40 2020 -0700
Fixing the race condition that segment finished before ControllerLeaderLocator created. (#5864)
---
.../java/org/apache/pinot/server/starter/helix/HelixServerStarter.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixServerStarter.java b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixServerStarter.java
index 09b18ce..abe2275 100644
--- a/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixServerStarter.java
+++ b/pinot-server/src/main/java/org/apache/pinot/server/starter/helix/HelixServerStarter.java
@@ -363,6 +363,7 @@ public class HelixServerStarter implements ServiceStartable {
LOGGER.info("Initializing server instance and registering state model factory");
Utils.logVersions();
+ ControllerLeaderLocator.create(_helixManager);
ServerSegmentCompletionProtocolHandler
.init(_serverConf.subset(SegmentCompletionProtocol.PREFIX_OF_CONFIG_OF_SEGMENT_UPLOADER));
ServerConf serverInstanceConfig = DefaultHelixStarterServerConfig.getDefaultHelixServerConfig(_serverConf);
@@ -414,8 +415,6 @@ public class HelixServerStarter implements ServiceStartable {
// Register the service status handler
registerServiceStatusHandler();
- ControllerLeaderLocator.create(_helixManager);
-
if (_serverConf
.getProperty(CONFIG_OF_STARTUP_ENABLE_SERVICE_STATUS_CHECK, DEFAULT_STARTUP_ENABLE_SERVICE_STATUS_CHECK)) {
long endTimeMs = startTimeMs + _serverConf.getProperty(CONFIG_OF_STARTUP_TIMEOUT_MS, DEFAULT_STARTUP_TIMEOUT_MS);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org