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 2017/01/10 23:12:26 UTC
[1/3] incubator-trafodion git commit: TRAFODION-2421
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 624d61ed4 -> 73446d89f
TRAFODION-2421
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d7c05519
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d7c05519
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d7c05519
Branch: refs/heads/master
Commit: d7c05519aeaee82b9425b1de652e0ad543bad4d1
Parents: 9b2b567
Author: mashengchen <ma...@gmail.com>
Authored: Tue Dec 27 10:13:51 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Wed Dec 28 02:09:00 2016 +0000
----------------------------------------------------------------------
dcs/src/main/java/org/trafodion/dcs/Constants.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d7c05519/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 ae61215..e6bbcc9 100644
--- a/dcs/src/main/java/org/trafodion/dcs/Constants.java
+++ b/dcs/src/main/java/org/trafodion/dcs/Constants.java
@@ -199,7 +199,7 @@ public final class Constants {
public static final String DCS_SERVER_USER_PROGRAM_RESTART_HANDLER_RETRY_INTERVAL_MILLIS = "dcs.server.user.program.restart.handler.retry.interval.millis";
/** 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;
+ public static final int DEFAULT_DCS_SERVER_USER_PROGRAM_RESTART_HANDLER_RETRY_INTERVAL_MILLIS = 450;
/** Name of ZooKeeper quorum configuration parameter. */
public static final String ZOOKEEPER_QUORUM = "dcs.zookeeper.quorum";
[2/3] incubator-trafodion git commit: change the wait time smooth
Posted by db...@apache.org.
change the wait time smooth
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a2439c5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a2439c5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a2439c5f
Branch: refs/heads/master
Commit: a2439c5fd42efb93fc871c607d595693cae3f9c8
Parents: d7c0551
Author: mashengchen <ma...@gmail.com>
Authored: Thu Dec 29 08:29:12 2016 +0000
Committer: mashengchen <ma...@gmail.com>
Committed: Thu Dec 29 08:29:12 2016 +0000
----------------------------------------------------------------------
dcs/src/main/java/org/trafodion/dcs/Constants.java | 2 +-
dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2439c5f/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 e6bbcc9..ae61215 100644
--- a/dcs/src/main/java/org/trafodion/dcs/Constants.java
+++ b/dcs/src/main/java/org/trafodion/dcs/Constants.java
@@ -199,7 +199,7 @@ public final class Constants {
public static final String DCS_SERVER_USER_PROGRAM_RESTART_HANDLER_RETRY_INTERVAL_MILLIS = "dcs.server.user.program.restart.handler.retry.interval.millis";
/** Default value for user program restart handler retry interval millis */
- public static final int DEFAULT_DCS_SERVER_USER_PROGRAM_RESTART_HANDLER_RETRY_INTERVAL_MILLIS = 450;
+ public static final int DEFAULT_DCS_SERVER_USER_PROGRAM_RESTART_HANDLER_RETRY_INTERVAL_MILLIS = 5000;
/** Name of ZooKeeper quorum configuration parameter. */
public static final String ZOOKEEPER_QUORUM = "dcs.zookeeper.quorum";
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a2439c5f/dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java
----------------------------------------------------------------------
diff --git a/dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java b/dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java
index 8acb750..769fef2 100644
--- a/dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java
+++ b/dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java
@@ -50,7 +50,7 @@ public class RetryCounter {
*/
public void sleepUntilNextRetry() throws InterruptedException {
int attempts = getAttemptTimes();
- long sleepTime = (long) (retryIntervalMillis * Math.pow(2, attempts));
+ long sleepTime = (long) (retryIntervalMillis * Math.log(attempts+15));
LOG.info("Sleeping " + sleepTime + "ms before retry #" + attempts + "...");
timeUnit.sleep(sleepTime);
}
[3/3] incubator-trafodion git commit: Merge [TRAFODION-2421] PR 897
Change progression of wait timeouts
Posted by db...@apache.org.
Merge [TRAFODION-2421] PR 897 Change progression of wait timeouts
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/73446d89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/73446d89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/73446d89
Branch: refs/heads/master
Commit: 73446d89f41c54ba3be9677bfdbc9b52b7cafd10
Parents: 624d61e a2439c5
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Jan 10 23:11:22 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Jan 10 23:11:22 2017 +0000
----------------------------------------------------------------------
dcs/src/main/java/org/trafodion/dcs/util/RetryCounter.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------