You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by ar...@apache.org on 2015/12/07 19:46:40 UTC
[1/4] incubator-trafodion git commit: useless to sleep 30s after
disconnecting
Repository: incubator-trafodion
Updated Branches:
refs/heads/master fbfab1e8f -> 4e8bc1bb6
useless to sleep 30s after disconnecting
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f68df24b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f68df24b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f68df24b
Branch: refs/heads/master
Commit: f68df24bc4ba9d06a466e247d92315bca3040bf2
Parents: e54c732
Author: Kevin Xu <ka...@esgyn.cn>
Authored: Thu Dec 3 15:17:15 2015 +0800
Committer: Kevin Xu <ka...@esgyn.cn>
Committed: Thu Dec 3 15:17:15 2015 +0800
----------------------------------------------------------------------
.../dcs/master/listener/ConnectReply.java | 72 ++++++++------------
.../org/trafodion/dcs/servermt/ServerUtils.java | 2 +-
2 files changed, 30 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f68df24b/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
index f0880b6..704c9a7 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
@@ -163,29 +163,20 @@ class ConnectReply {
for(int i=0; i < randomPicks; i++){
while(true){
index = random.nextInt();
- index = index > 0? index : -index;
+ index = Math.abs(index);
index %= length;
if (indexArr[index] != index) break;
}
indexArr[index] = index;
- maxIndex = index > maxIndex ? index : maxIndex;
+ maxIndex = Math.max(maxIndex, index);
server = servers.get(index);
if(LOG.isDebugEnabled())
- LOG.debug(clientSocketAddress + ": " + " index " + index + " server picked " + server );
-
- nodeRegisteredPath = registeredPath + "/" + server;
- stat = zkc.exists(nodeRegisteredPath,false);
- if(stat != null){
- data = zkc.getData(nodeRegisteredPath, false, stat);
- if (false == (new String(data)).startsWith("AVAILABLE:"))
- continue;
- else {
- found = true;
- break;
- }
- }
- else
- continue;
+ LOG.debug(clientSocketAddress + ": " + "server selected in search 1 " + server );
+ data = isServerAvalible(registeredPath + "/" + server);
+ if(data != null){
+ found = true;
+ break;
+ }else continue;
}
//
// search sequentially for AVAILABLE server starting from highest random index + 1 to length
@@ -197,19 +188,11 @@ class ConnectReply {
if(LOG.isDebugEnabled())
LOG.debug(clientSocketAddress + ": " + "server selected in search 1 " + server );
- nodeRegisteredPath = registeredPath + "/" + server;
- stat = zkc.exists(nodeRegisteredPath,false);
- if(stat != null){
- data = zkc.getData(nodeRegisteredPath, false, stat);
- if (false == (new String(data)).startsWith("AVAILABLE:"))
- continue;
- else {
- found = true;
- break;
- }
- }
- else
- continue;
+ data = isServerAvalible(registeredPath + "/" + server);
+ if(data != null){
+ found = true;
+ break;
+ }else continue;
}
}
}
@@ -223,19 +206,11 @@ class ConnectReply {
if(LOG.isDebugEnabled())
LOG.debug(clientSocketAddress + ": " + "server selected in search 2 " + server );
- nodeRegisteredPath = registeredPath + "/" + server;
- stat = zkc.exists(nodeRegisteredPath,false);
- if(stat != null){
- data = zkc.getData(nodeRegisteredPath, false, stat);
- if (false == (new String(data)).startsWith("AVAILABLE:"))
- continue;
- else {
- found = true;
- break;
- }
- }
- else
- continue;
+ data = isServerAvalible(registeredPath + "/" + server);
+ if(data != null){
+ found = true;
+ break;
+ }else continue;
}
}
}
@@ -335,4 +310,15 @@ class ConnectReply {
}
return replyException;
}
+
+ private byte[] isServerAvalible(String serverPath) throws KeeperException, InterruptedException {
+ Stat stat = zkc.exists(serverPath,false);
+ if(stat != null){
+ byte[] data = zkc.getData(serverPath, false, stat);
+ if(data != null && new String(data).startsWith("AVAILABLE:")){
+ return data;
+ }
+ }
+ return null;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f68df24b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerUtils.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerUtils.java b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerUtils.java
index 8fc93d0..2962e74 100644
--- a/dcs/src/main/java/org/trafodion/dcs/servermt/ServerUtils.java
+++ b/dcs/src/main/java/org/trafodion/dcs/servermt/ServerUtils.java
@@ -209,7 +209,7 @@ public final class ServerUtils {
updateStateToConnected();
}
else if (serverState == ServerConstants.SERVER_STATE_DISCONNECTED){
- updateStateDisconnected();
+ //updateStateDisconnected();
updateServerStateAvailable();
}
else if (serverState == ServerConstants.SERVER_STATE_CONNECT_FAILED){
[4/4] incubator-trafodion git commit: Merge [TRAFODION-1656] PR-202
Remove DISCONNECTED& refactor some code
Posted by ar...@apache.org.
Merge [TRAFODION-1656] PR-202 Remove DISCONNECTED& refactor some code
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4e8bc1bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4e8bc1bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4e8bc1bb
Branch: refs/heads/master
Commit: 4e8bc1bb6b96674e3e911d815b5e3bc3a08dfb7a
Parents: fbfab1e f1b7b43
Author: Arvind Narain <ar...@apache.org>
Authored: Mon Dec 7 18:44:36 2015 +0000
Committer: Arvind Narain <ar...@apache.org>
Committed: Mon Dec 7 18:44:36 2015 +0000
----------------------------------------------------------------------
.../dcs/master/listener/ConnectReply.java | 75 +++++++++-----------
.../org/trafodion/dcs/servermt/ServerUtils.java | 2 +-
2 files changed, 33 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
[3/4] incubator-trafodion git commit: Add back the log
Posted by ar...@apache.org.
Add back the log
server is a unique node name, so here index is useless. but no-harm to add more info
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f1b7b43c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f1b7b43c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f1b7b43c
Branch: refs/heads/master
Commit: f1b7b43ca66b9ca2b91a95eb7452b5563f6d878e
Parents: 0068ed3
Author: kevinxu021 <ka...@esgyn.cn>
Authored: Fri Dec 4 09:18:24 2015 +0800
Committer: kevinxu021 <ka...@esgyn.cn>
Committed: Fri Dec 4 09:18:24 2015 +0800
----------------------------------------------------------------------
.../java/org/trafodion/dcs/master/listener/ConnectReply.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/f1b7b43c/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
index 6012b74..482f61a 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
@@ -171,8 +171,8 @@ class ConnectReply {
maxIndex = Math.max(maxIndex, index);
server = servers.get(index);
nodeRegisteredPath = registeredPath + "/" + server;
- if(LOG.isDebugEnabled())
- LOG.debug(clientSocketAddress + ": " + "server selected in search 1 " + server );
+ if(LOG.isDebugEnabled())
+ LOG.debug(clientSocketAddress + ": " + " index " + index + " server picked " + server );
data = isServerAvalible(nodeRegisteredPath);
if(data != null){
found = true;
[2/4] incubator-trafodion git commit: format node path
Posted by ar...@apache.org.
format node path
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0068ed34
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0068ed34
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0068ed34
Branch: refs/heads/master
Commit: 0068ed3494b29106800f4b32e162156cd4a660ef
Parents: f68df24
Author: Kevin Xu <ka...@esgyn.cn>
Authored: Thu Dec 3 15:57:20 2015 +0800
Committer: Kevin Xu <ka...@esgyn.cn>
Committed: Thu Dec 3 15:57:20 2015 +0800
----------------------------------------------------------------------
.../org/trafodion/dcs/master/listener/ConnectReply.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0068ed34/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java b/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
index 704c9a7..6012b74 100644
--- a/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
+++ b/dcs/src/main/java/org/trafodion/dcs/master/listener/ConnectReply.java
@@ -170,9 +170,10 @@ class ConnectReply {
indexArr[index] = index;
maxIndex = Math.max(maxIndex, index);
server = servers.get(index);
+ nodeRegisteredPath = registeredPath + "/" + server;
if(LOG.isDebugEnabled())
LOG.debug(clientSocketAddress + ": " + "server selected in search 1 " + server );
- data = isServerAvalible(registeredPath + "/" + server);
+ data = isServerAvalible(nodeRegisteredPath);
if(data != null){
found = true;
break;
@@ -185,10 +186,11 @@ class ConnectReply {
for(index=maxIndex+1; index<length; index++){
if (indexArr[index] != index){
server = servers.get(index);
+ nodeRegisteredPath = registeredPath + "/" + server;
if(LOG.isDebugEnabled())
LOG.debug(clientSocketAddress + ": " + "server selected in search 1 " + server );
- data = isServerAvalible(registeredPath + "/" + server);
+ data = isServerAvalible(nodeRegisteredPath);
if(data != null){
found = true;
break;
@@ -203,10 +205,11 @@ class ConnectReply {
for(index=0; index<maxIndex; index++){
if (indexArr[index] != index){
server = servers.get(index);
+ nodeRegisteredPath = registeredPath + "/" + server;
if(LOG.isDebugEnabled())
LOG.debug(clientSocketAddress + ": " + "server selected in search 2 " + server );
- data = isServerAvalible(registeredPath + "/" + server);
+ data = isServerAvalible(nodeRegisteredPath);
if(data != null){
found = true;
break;