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:10 UTC

[2/3] trafodion git commit: TRAFODION-2877 optimize log when DCS server is not restarted

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();