diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-10-25 16:07:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-25 16:07:03 +0200 |
| commit | 7c4f9cdc49888f523e509b2987aa538e4eb0a6c1 (patch) | |
| tree | 1ae109380acd748047a36c96f725217834a48275 | |
| parent | f327a02ab8ce74b2db7f5eded2b1ad2e807e4a18 (diff) | |
| parent | 5b6359cdcea498fcc42cdd9432de14c9343d52ba (diff) | |
Merge pull request #7450 from vespa-engine/jvenstad/log-adjustments
Jvenstad/log adjustments
3 files changed, 4 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index e7ffa5115f1..a3d1d389481 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -572,12 +572,10 @@ public class InternalStepRunner implements StepRunner { private final RunId id; private final Step step; - private final String prefix; private DualLogger(RunId id, Step step) { this.id = id; this.step = step; - this.prefix = id + " at " + step + ": "; } private void log(String message) { @@ -589,7 +587,7 @@ public class InternalStepRunner implements StepRunner { } private void log(Level level, String message, Throwable thrown) { - logger.log(level, message, thrown); + logger.log(level, id + " at " + step + ": " + message, thrown); if (thrown != null) { ByteArrayOutputStream traceBuffer = new ByteArrayOutputStream(); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java index 3df4451f900..2833bc8614e 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/BufferedLogStore.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; */ public class BufferedLogStore { - static final int chunkSize = 1 << 17; + static final int chunkSize = 1 << 13; private final CuratorDb buffer; private final RunDataStore store; diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java index 9ee477e5ab2..631aaa5a909 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java @@ -410,7 +410,8 @@ public class CuratorDb { public LongStream getLogChunkIds(ApplicationId id, JobType type) { return curator.getChildren(runsPath(id, type).append("logs")).stream() - .mapToLong(Long::parseLong); + .mapToLong(Long::parseLong) + .sorted(); } // -------------- Provisioning (called by internal code) ------------------ |