You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by go...@apache.org on 2017/08/17 07:03:44 UTC
incubator-slider git commit: SLIDER-1236 Unnecessary 10 second sleep
before installation
Repository: incubator-slider
Updated Branches:
refs/heads/develop f18d6ead7 -> 9b6deb38e
SLIDER-1236 Unnecessary 10 second sleep before installation
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9b6deb38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9b6deb38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9b6deb38
Branch: refs/heads/develop
Commit: 9b6deb38efe44cd4e5cff26613e318383613d4be
Parents: f18d6ea
Author: Gour Saha <go...@apache.org>
Authored: Thu Aug 17 00:03:32 2017 -0700
Committer: Gour Saha <go...@apache.org>
Committed: Thu Aug 17 00:03:32 2017 -0700
----------------------------------------------------------------------
slider-agent/src/main/python/agent/Controller.py | 2 +-
slider-agent/src/main/python/agent/NetUtil.py | 3 ++-
.../src/main/java/org/apache/slider/client/SliderClient.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9b6deb38/slider-agent/src/main/python/agent/Controller.py
----------------------------------------------------------------------
diff --git a/slider-agent/src/main/python/agent/Controller.py b/slider-agent/src/main/python/agent/Controller.py
index db0205f..a3e75a4 100644
--- a/slider-agent/src/main/python/agent/Controller.py
+++ b/slider-agent/src/main/python/agent/Controller.py
@@ -632,7 +632,7 @@ class Controller(threading.Thread):
# Process callbacks
for callback in self.registration_listeners:
callback()
- time.sleep(self.netutil.HEARTBEAT_IDDLE_INTERVAL_SEC)
+ time.sleep(self.netutil.HEARTBEAT_START_DELAY_SEC)
self.heartbeatWithServer()
logger.info("Controller stopped heartbeating.")
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9b6deb38/slider-agent/src/main/python/agent/NetUtil.py
----------------------------------------------------------------------
diff --git a/slider-agent/src/main/python/agent/NetUtil.py b/slider-agent/src/main/python/agent/NetUtil.py
index 88c129a..11a0002 100644
--- a/slider-agent/src/main/python/agent/NetUtil.py
+++ b/slider-agent/src/main/python/agent/NetUtil.py
@@ -26,7 +26,8 @@ logger = logging.getLogger()
class NetUtil:
CONNECT_SERVER_RETRY_INTERVAL_SEC = 10
- HEARTBEAT_IDDLE_INTERVAL_SEC = 10
+ HEARTBEAT_IDDLE_INTERVAL_SEC = 1
+ HEARTBEAT_START_DELAY_SEC = 0.01
MINIMUM_INTERVAL_BETWEEN_HEARTBEATS = 0.1
# For testing purposes
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9b6deb38/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index b5428be..1b191a7 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -1588,7 +1588,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
log.info("Deleting package {} at {}.", actionPackageArgs.name, pkgPath);
if(fs.delete(pkgPath, true)) {
- log.info("Deleted package {} " + actionPackageArgs.name);
+ log.info("Deleted package {} ", actionPackageArgs.name);
return EXIT_SUCCESS;
} else {
log.warn("Package deletion failed.");