TRAFODION-2844 use new variables for dcs startup mxosrvr
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/52d45a55 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/52d45a55 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/52d45a55 Branch: refs/heads/master Commit: 52d45a55babe6a9bf0f97666c3a6d0d7e9e9bd68 Parents: abfd6d6 Author: aven <[email protected]> Authored: Tue Jan 16 13:58:33 2018 +0800 Committer: aven <[email protected]> Committed: Tue Jan 16 13:58:33 2018 +0800 ---------------------------------------------------------------------- dcs/src/main/java/org/trafodion/dcs/Constants.java | 14 ++++++++++---- .../java/org/trafodion/dcs/server/ServerManager.java | 12 ++++++------ dcs/src/main/resources/dcs-default.xml | 13 ++++++++++--- 3 files changed, 26 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/52d45a55/dcs/src/main/java/org/trafodion/dcs/Constants.java ---------------------------------------------------------------------- diff --git a/dcs/src/main/java/org/trafodion/dcs/Constants.java b/dcs/src/main/java/org/trafodion/dcs/Constants.java index 63a59c5..3f88437 100644 --- a/dcs/src/main/java/org/trafodion/dcs/Constants.java +++ b/dcs/src/main/java/org/trafodion/dcs/Constants.java @@ -201,13 +201,19 @@ public final class Constants { /** Default value for user program restart handler retry interval millis */ public static final int DEFAULT_DCS_SERVER_USER_PROGRAM_RESTART_HANDLER_RETRY_INTERVAL_MILLIS = 5000; + /** Configuration key for user program restart handler attempts for mxosrvr*/ + public static final String DCS_SERVER_STARTUP_MXOSRVR_USER_PROGRAM_RESTART_HANDLER_ATTEMPTS = "dcs.server.startup.mxosrvr.user.program.restart.handler.attempts"; + + /** Default value for user program restart handler attempts for mxosrvr */ + public static final int DEFAULT_DCS_SERVER_STARTUP_MXOSRVR_USER_PROGRAM_RESTART_HANDLER_ATTEMPTS = 6; + /** Configuration key for user program restart handler retry timeout minutes */ - public static final String DCS_SERVER_USER_PROGRAM_RESTART_HANDLER_RETRY_TIMEOUT_MINUTES = "dcs.server.user.program.restart.handler.retry.timeout.minutes"; + public static final String DCS_SERVER_STARTUP_MXOSRVR_USER_PROGRAM_RESTART_HANDLER_RETRY_TIMEOUT_MINUTES = "dcs.server.startup.mxosrvr.user.program.restart.handler.retry.timeout.minutes"; - /** Default value for user program restart handler retry timeout minutes */ - public static final int DEFAULT_DCS_SERVER_USER_PROGRAM_RESTART_HANDLER_RETRY_TIMEOUT_MINUTES = 30; + /** Default value for user program restart handler retry timeout minutes for mxosrvr */ + public static final int DEFAULT_DCS_SERVER_STARTUP_MXOSRVR_USER_PROGRAM_RESTART_HANDLER_RETRY_TIMEOUT_MINUTES = 6; - /** Name of ZooKeeper quorum configuration parameter. */ + /** Name of6ZooKeeper quorum configuration parameter. */ public static final String ZOOKEEPER_QUORUM = "dcs.zookeeper.quorum"; /** Name of ZooKeeper config file in conf/ directory. */ http://git-wip-us.apache.org/repos/asf/trafodion/blob/52d45a55/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java ---------------------------------------------------------------------- diff --git a/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java b/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java index 81e74df..89186d5 100644 --- a/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java +++ b/dcs/src/main/java/org/trafodion/dcs/server/ServerManager.java @@ -212,12 +212,12 @@ public final class ServerManager implements Callable { public void exec() throws Exception { cleanupZk(); - LOG.info("[" + childInstance + "]. User program exec [" + scriptContext.getCommand() + "]"); + LOG.info("Instance : [" + childInstance + "], User program exec [" + scriptContext.getCommand() + "]"); ScriptManager.getInstance().runScript(scriptContext);// This will // block while // user prog is // running - LOG.info("[" + childInstance + "]. User program exit [" + scriptContext.getExitCode() + "]"); + LOG.info("Instance : [" + childInstance + "], User program exit [" + scriptContext.getExitCode() + "]"); StringBuilder sb = new StringBuilder(); sb.append("exit code [" + scriptContext.getExitCode() + "]"); if (!scriptContext.getStdOut().toString().isEmpty()) @@ -260,11 +260,11 @@ public final class ServerManager implements Callable { RetryCounter retryCounter; public ServerHandler(Configuration conf ,int childInstance) { - int maxRestartAttempts = conf.getInt(Constants.DCS_SERVER_USER_PROGRAM_RESTART_HANDLER_ATTEMPTS, - Constants.DEFAULT_DCS_SERVER_USER_PROGRAM_RESTART_HANDLER_ATTEMPTS); + int maxRestartAttempts = conf.getInt(Constants.DCS_SERVER_STARTUP_MXOSRVR_USER_PROGRAM_RESTART_HANDLER_ATTEMPTS, + Constants.DEFAULT_DCS_SERVER_STARTUP_MXOSRVR_USER_PROGRAM_RESTART_HANDLER_ATTEMPTS); int retryTimeoutMinutes = conf.getInt( - Constants.DCS_SERVER_USER_PROGRAM_RESTART_HANDLER_RETRY_TIMEOUT_MINUTES, - Constants.DEFAULT_DCS_SERVER_USER_PROGRAM_RESTART_HANDLER_RETRY_TIMEOUT_MINUTES); + Constants.DCS_SERVER_STARTUP_MXOSRVR_USER_PROGRAM_RESTART_HANDLER_RETRY_TIMEOUT_MINUTES, + Constants.DEFAULT_DCS_SERVER_STARTUP_MXOSRVR_USER_PROGRAM_RESTART_HANDLER_RETRY_TIMEOUT_MINUTES); this.childInstance = childInstance; this.registeredPath = parentZnode + Constants.DEFAULT_ZOOKEEPER_ZNODE_SERVERS_REGISTERED http://git-wip-us.apache.org/repos/asf/trafodion/blob/52d45a55/dcs/src/main/resources/dcs-default.xml ---------------------------------------------------------------------- diff --git a/dcs/src/main/resources/dcs-default.xml b/dcs/src/main/resources/dcs-default.xml index ded30cf..12a4bf7 100644 --- a/dcs/src/main/resources/dcs-default.xml +++ b/dcs/src/main/resources/dcs-default.xml @@ -373,10 +373,17 @@ </description> </property> <property> - <name>dcs.server.user.program.restart.handler.retry.timeout.minutes</name> - <value>30</value> + <name>dcs.server.startup.mxosrvr.user.program.restart.handler.attempts</name> + <value>6</value> <description> - Timeout minutes between first and max server restart times. + DCS Server attempts to startup MXOSRVR times inner a configured time. + </description> + </property> + <property> + <name>dcs.server.startup.mxosrvr.user.program.restart.handler.retry.timeout.minutes</name> + <value>6</value> + <description> + Timeout minutes between first and max times (6 default) DCS Server startup MXOSRVR. </description> </property> </configuration>
