You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by rm...@apache.org on 2015/10/29 00:45:27 UTC
[2/4] incubator-trafodion git commit:
d3e0914d16c0fca99fa0c0b92aedb69158c3f5b3
d3e0914d16c0fca99fa0c0b92aedb69158c3f5b3
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/cd799454
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/cd799454
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/cd799454
Branch: refs/heads/master
Commit: cd7994543288a8b1a1ba40fd4ed8bac8e0c9d7aa
Parents: 3af9220
Author: Kevin Xu <ka...@esgyn.cn>
Authored: Tue Oct 20 08:46:03 2015 +0800
Committer: Kevin Xu <ka...@esgyn.cn>
Committed: Mon Oct 26 13:22:38 2015 +0800
----------------------------------------------------------------------
.../dcs/tmpl/server/ServerStatusTmpl.jamon | 7 ++++++-
.../dcs/tmpl/servermt/ServerStatusTmpl.jamon | 7 ++++++-
.../org/trafodion/dcs/master/ServerManager.java | 3 ++-
.../main/resources/dcs-webapps/master/servers.jsp | 17 +++++++++++------
4 files changed, 25 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cd799454/dcs/src/main/jamon/org/trafodion/dcs/tmpl/server/ServerStatusTmpl.jamon
----------------------------------------------------------------------
diff --git a/dcs/src/main/jamon/org/trafodion/dcs/tmpl/server/ServerStatusTmpl.jamon b/dcs/src/main/jamon/org/trafodion/dcs/tmpl/server/ServerStatusTmpl.jamon
index fe24e73..e736605 100644
--- a/dcs/src/main/jamon/org/trafodion/dcs/tmpl/server/ServerStatusTmpl.jamon
+++ b/dcs/src/main/jamon/org/trafodion/dcs/tmpl/server/ServerStatusTmpl.jamon
@@ -31,6 +31,7 @@ org.trafodion.dcs.server.DcsServer;
org.trafodion.dcs.util.DcsConfiguration;
org.trafodion.dcs.Constants;
org.trafodion.dcs.util.Bytes;
+java.net.InetAddress;
</%import>
<%java>
@@ -39,6 +40,10 @@ org.trafodion.dcs.util.Bytes;
int serverInfoPort = server.getConfiguration().getInt("dcs.server.info.port", 40030);
String trafodionHome = server.getTrafodionHome();
boolean trafodionLogs = server.getConfiguration().getBoolean(Constants.DCS_MASTER_TRAFODION_LOGS, Constants.DEFAULT_DCS_MASTER_TRAFODION_LOGS);
+ String masterIP = server.getMasterHostName();
+ try{
+ masterIP = InetAddress.getByName(server.getMasterHostName()).getHostAddress();
+ }catch(Exception e){}
</%java>
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Commenting out DOCTYPE so our blue outline shows on hadoop 0.20.205.0, etc.
@@ -55,7 +60,7 @@ org.trafodion.dcs.util.Bytes;
<body>
<h1 id="page_title">DcsServer: <% server.getServerName() %>:<% server.getInfoServer().getPort() %></h1>
<p id="links_menu">
- <a href="http://<% server.getMasterHostName() %>:<% masterInfoPort %>">Home</a>,
+ <a href="http://<% masterIP %>:<% masterInfoPort %>">Home</a>,
<a href="/logs/">Dcs local logs</a>
<%java>
if(! trafodionHome.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cd799454/dcs/src/main/jamon/org/trafodion/dcs/tmpl/servermt/ServerStatusTmpl.jamon
----------------------------------------------------------------------
diff --git a/dcs/src/main/jamon/org/trafodion/dcs/tmpl/servermt/ServerStatusTmpl.jamon b/dcs/src/main/jamon/org/trafodion/dcs/tmpl/servermt/ServerStatusTmpl.jamon
index 3dfd113..dfa860e 100644
--- a/dcs/src/main/jamon/org/trafodion/dcs/tmpl/servermt/ServerStatusTmpl.jamon
+++ b/dcs/src/main/jamon/org/trafodion/dcs/tmpl/servermt/ServerStatusTmpl.jamon
@@ -31,6 +31,7 @@ org.trafodion.dcs.servermt.DcsServer;
org.trafodion.dcs.util.DcsConfiguration;
org.trafodion.dcs.Constants;
org.trafodion.dcs.util.Bytes;
+java.net.InetAddress;
</%import>
<%java>
@@ -39,6 +40,10 @@ org.trafodion.dcs.util.Bytes;
int serverInfoPort = server.getConfiguration().getInt("dcs.server.info.port", 40030);
String trafodionHome = server.getTrafodionHome();
boolean trafodionLogs = server.getConfiguration().getBoolean(Constants.DCS_MASTER_TRAFODION_LOGS, Constants.DEFAULT_DCS_MASTER_TRAFODION_LOGS);
+ String masterIP = server.getMasterHostName();
+ try{
+ masterIP = InetAddress.getByName(server.getMasterHostName()).getHostAddress();
+ }catch(Exception e){}
</%java>
<?xml version="1.0" encoding="UTF-8" ?>
<!-- Commenting out DOCTYPE so our blue outline shows on hadoop 0.20.205.0, etc.
@@ -55,7 +60,7 @@ org.trafodion.dcs.util.Bytes;
<body>
<h1 id="page_title">DcsServer: <% server.getServerName() %>:<% server.getInfoServer().getPort() %></h1>
<p id="links_menu">
- <a href="http://<% server.getMasterHostName() %>:<% masterInfoPort %>">Home</a>,
+ <a href="http://<% masterIP %>:<% masterInfoPort %>">Home</a>,
<a href="/logs/">Dcs local logs</a>
<%java>
if(! trafodionHome.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cd799454/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 878bfcd..8594c36 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/ServerManager.java
@@ -698,7 +698,8 @@ public class ServerManager implements Callable {
for (RegisteredServer aRegisteredServer : aRunningServer
.getRegistered()) {
ServerItem serverItem = new ServerItem();
- serverItem.setHostname(aRunningServer.getHref());
+ serverItem.setHostname(aRunningServer.getHostname());
+ serverItem.setinfoPort(aRunningServer.getInfoPort() + "");
serverItem.setInstance(aRunningServer.getInstance());
serverItem.setStartTime(aRunningServer.getStartTimeAsDate());
serverItem.setIsRegistered(aRegisteredServer.getIsRegistered());
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cd799454/dcs/src/main/resources/dcs-webapps/master/servers.jsp
----------------------------------------------------------------------
diff --git a/dcs/src/main/resources/dcs-webapps/master/servers.jsp b/dcs/src/main/resources/dcs-webapps/master/servers.jsp
index 0e6316d..b972886 100644
--- a/dcs/src/main/resources/dcs-webapps/master/servers.jsp
+++ b/dcs/src/main/resources/dcs-webapps/master/servers.jsp
@@ -43,6 +43,7 @@
serverItemList = master.getServerManager().getServerItemList();
String masterServerName = master.getServerName();
int masterInfoPort = master.getInfoPort();
+ String masterIP = master.getNetConf().getExtHostAddress();
String version = org.trafodion.dcs.util.VersionInfo.getVersion();
String revision = org.trafodion.dcs.util.VersionInfo.getRevision();
String buildDate = org.trafodion.dcs.util.VersionInfo.getDate();
@@ -96,9 +97,9 @@
<link rel="stylesheet" type="text/css" href="/static/dcs.css" />
</head>
<body>
-<h1 id="page_title">DcsMaster: <%= masterServerName %>:<%= masterInfoPort %></h1>
+<h1 id="page_title">DcsMaster: <%= masterIP %>:<%= masterInfoPort %></h1>
<p id="links_menu">
- <a href="http://<%= masterServerName %>:<%= masterInfoPort %>?pagesize=<%= pageSize %>">Home</a>,
+ <a href="http://<%= masterIP %>:<%= masterInfoPort %>?pagesize=<%= pageSize %>">Home</a>,
<a href="/logs/">Dcs local logs</a><% if(! trafodionHome.isEmpty()) { %><% if(trafodionLogs) { %>, <a href="/TrafodionLogs/">Trafodion local logs</a><% } %><% if(trafodionQueryTools) { %>, <a href="repository.jsp?type=<%= Constants.TRAFODION_REPOS_CATALOG_SCHEMA %>">Trafodion query tools</a><% } %><% } %>
</p>
<hr id="head_rule" />
@@ -156,8 +157,10 @@ entries
<%
if(pageSize.equals("All")) {
%>
- <display:table name="serverItemList" id="parent">
- <display:column property="hostname" title="HostName" sortable="true" group="1"/>
+ <display:table name="serverItemList" id="currow">
+ <display:column escapeXml="false" title="Host Name" sortable="true" group="1">
+ <a href='http://${currow.ipAddress}:${currow.infoPort}'>${currow.hostname}</a>
+ </display:column>
<display:column property="instance" title="Instance" sortable="true" group="2"/>
<display:column property="startTime" title="Start Time" sortable="true"/>
<display:column property="isRegistered" title="Registered" sortable="true"/>
@@ -175,8 +178,10 @@ entries
<%
} else {
%>
- <display:table name="serverItemList" id="parent" pagesize="<%= pageSizeInteger %>">
- <display:column property="hostname" title="HostName" sortable="true" group="1"/>
+ <display:table name="serverItemList" id="currow" pagesize="<%= pageSizeInteger %>">
+ <display:column escapeXml="false" title="Host Name" sortable="true" group="1">
+ <a href='http://${currow.ipAddress}:${currow.infoPort}'>${currow.hostname}</a>
+ </display:column>
<display:column property="instance" title="Instance" sortable="true" group="2"/>
<display:column property="startTime" title="Start Time" sortable="true"/>
<display:column property="isRegistered" title="Registered" sortable="true"/>