You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2018/01/06 19:35:09 UTC
[1/3] trafodion git commit: TRAFODION-2877 restart DCSServer when
switch to backup-master
Repository: trafodion
Updated Branches:
refs/heads/master 33325b65c -> 6185132a8
TRAFODION-2877 restart DCSServer when switch to backup-master
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/25959982
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/25959982
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/25959982
Branch: refs/heads/master
Commit: 2595998299e1a6bb281544e00faab1f7c7ceddda
Parents: 6be0b22
Author: aven <sh...@esgyn.cn>
Authored: Thu Jan 4 18:15:54 2018 +0800
Committer: aven <sh...@esgyn.cn>
Committed: Thu Jan 4 18:15:54 2018 +0800
----------------------------------------------------------------------
.../org/trafodion/dcs/master/ServerManager.java | 21 ++++++++++----------
1 file changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/25959982/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java b/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java
index 8594c36..a9407f9 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java
@@ -176,8 +176,8 @@ public class ServerManager implements Callable {
// But, if we are DcsMaster follower that is taking over from
// failed one then ignore timestamp issues described above.
// See MasterLeaderElection.elect()
- if ((master.isFollower() == false)
- && (serverStartTimestamp > startupTimestamp)) {
+ if ((master.isFollower() == false && serverStartTimestamp > startupTimestamp)
+ || (master.isFollower() && runningServers.size() < configuredServers.size())) {
scriptContext.setHostName(hostName);
scriptContext
.setScriptName(Constants.SYS_SHELL_SCRIPT_NAME);
@@ -240,15 +240,14 @@ public class ServerManager implements Callable {
}
}
} else {
- if (LOG.isDebugEnabled())
- LOG.debug("No restart for "
- + znodePath
- + "\nbecause DcsServer start time ["
- + DateFormat.getDateTimeInstance().format(
- new Date(serverStartTimestamp))
- + "] was before DcsMaster start time ["
- + DateFormat.getDateTimeInstance().format(
- new Date(startupTimestamp)) + "]");
+ LOG.info("No restart for "
+ + znodePath
+ + "\nbecause DcsServer start time ["
+ + DateFormat.getDateTimeInstance().format(
+ new Date(serverStartTimestamp))
+ + "] was before DcsMaster start time ["
+ + DateFormat.getDateTimeInstance().format(
+ new Date(startupTimestamp)) + "]");
}
} catch (Exception e) {
e.printStackTrace();
[3/3] trafodion git commit: Merge [TRAFODION-2877] PR 1369 DCSServer
restart bug with backup master
Posted by db...@apache.org.
Merge [TRAFODION-2877] PR 1369 DCSServer restart bug with backup master
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/6185132a
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/6185132a
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/6185132a
Branch: refs/heads/master
Commit: 6185132a817ccbf497ec199d7d5ba4e20c9c2deb
Parents: 33325b6 06e9fb6
Author: Dave Birdsall <db...@apache.org>
Authored: Sat Jan 6 19:34:12 2018 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Sat Jan 6 19:34:12 2018 +0000
----------------------------------------------------------------------
.../org/trafodion/dcs/master/ServerManager.java | 24 +++++++++++---------
1 file changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[2/3] trafodion git commit: TRAFODION-2877 optimize log when DCS
server is not restarted
Posted by db...@apache.org.
TRAFODION-2877 optimize log when DCS server is not restarted
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/06e9fb61
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/06e9fb61
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/06e9fb61
Branch: refs/heads/master
Commit: 06e9fb61c4d9c5904b77f0dee053797decf26fe6
Parents: 2595998
Author: aven <sh...@esgyn.cn>
Authored: Fri Jan 5 13:34:41 2018 +0800
Committer: aven <sh...@esgyn.cn>
Committed: Fri Jan 5 13:34:41 2018 +0800
----------------------------------------------------------------------
.../org/trafodion/dcs/master/ServerManager.java | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/06e9fb61/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java b/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java
index a9407f9..e81d1b2 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java
@@ -240,14 +240,17 @@ public class ServerManager implements Callable {
}
}
} else {
- LOG.info("No restart for "
- + znodePath
- + "\nbecause DcsServer start time ["
- + DateFormat.getDateTimeInstance().format(
- new Date(serverStartTimestamp))
- + "] was before DcsMaster start time ["
- + DateFormat.getDateTimeInstance().format(
- new Date(startupTimestamp)) + "]");
+ StringBuffer sb = new StringBuffer();
+ sb.append("No restart for ").append(znodePath).append(System.getProperty("line.separator"));
+ sb.append("DCS Master isFollower [").append(master.isFollower()).append("], ");
+ sb.append("DCS Master start time [")
+ .append(DateFormat.getDateTimeInstance().format(new Date(startupTimestamp))).append("], ");
+ sb.append("DCS Server start time [")
+ .append(DateFormat.getDateTimeInstance().format(new Date(serverStartTimestamp))).append("], ");
+ sb.append("running DCS Server num is [").append(runningServers.size())
+ .append("], registered DCS Server num is [").append(registeredServers.size()).append("].");
+
+ LOG.info(sb.toString());
}
} catch (Exception e) {
e.printStackTrace();