diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-08-28 14:51:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-28 14:51:50 +0200 |
| commit | f1d7cb23c59a9e2f297d16f21e08df5f3c2e1aae (patch) | |
| tree | a9cb48a6176f89170ac472f98f10aea7a838b594 | |
| parent | eada04a2e2a40e5925dfb46d5ac57f52ccb3d57e (diff) | |
| parent | cbc229afc827385775de59d5067d85de8c916e0c (diff) | |
Merge branch 'master' into balder/move-databuffer-and-compression-to-vespalib
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java | 6 | ||||
| -rwxr-xr-x | travis/travis-build-cpp.sh | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java index 2e81ef19f5e..9d2198cedcc 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java @@ -180,7 +180,9 @@ public class NodeAgentImpl implements NodeAgent { @Override public void start(int intervalMillis) { - addDebugMessage("Starting with interval " + intervalMillis + "ms"); + String message = "Starting with interval " + intervalMillis + " ms"; + logger.info(message); + addDebugMessage(message); delaysBetweenEachConvergeMillis = intervalMillis; if (loopThread != null) { throw new RuntimeException("Can not restart a node agent."); @@ -214,6 +216,8 @@ public class NodeAgentImpl implements NodeAgent { } catch (InterruptedException e) { logger.error("Interrupted; Could not stop filebeatrestarter thread"); } + + logger.info("Stopped"); } private void runLocalResumeScriptIfNeeded() { diff --git a/travis/travis-build-cpp.sh b/travis/travis-build-cpp.sh index 4386be3b878..825da67bf54 100755 --- a/travis/travis-build-cpp.sh +++ b/travis/travis-build-cpp.sh @@ -7,7 +7,7 @@ BUILD_DIR=~/build mkdir "${BUILD_DIR}" -export CCACHE_MAXSIZE="1G" +export CCACHE_MAXSIZE="1250M" export CCACHE_COMPRESS=1 NUM_THREADS=4 ccache --print-config |