Repository: incubator-slider Updated Branches: refs/heads/develop 5a83421b2 -> 8850d062b
SLIDER-1200 TestLongLivedProcess#testSetenv and TestWorkflowForkedProcessService#testSetenv fail in certain scenarios Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8850d062 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8850d062 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8850d062 Branch: refs/heads/develop Commit: 8850d062b1dcf3de1608ced67a0860eeb340a975 Parents: 5a83421 Author: Gour Saha <gourks...@apache.org> Authored: Wed Feb 1 22:31:59 2017 -0800 Committer: Gour Saha <gourks...@apache.org> Committed: Wed Feb 1 22:31:59 2017 -0800 ---------------------------------------------------------------------- .../slider/server/services/workflow/ForkedProcessService.java | 4 ++++ .../slider/server/services/workflow/TestLongLivedProcess.java | 2 ++ .../services/workflow/TestWorkflowForkedProcessService.java | 2 ++ 3 files changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8850d062/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java index 352be49..9103321 100644 --- a/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java +++ b/slider-core/src/main/java/org/apache/slider/server/services/workflow/ForkedProcessService.java @@ -152,6 +152,10 @@ public class ForkedProcessService this.timeoutCode = code; } + public void setRecentLineLimit(int limit) { + process.setRecentLineLimit(limit); + } + /** * Build the process to execute when the service is started * @param commandList list of commands is inserted on the front http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8850d062/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java ---------------------------------------------------------------------- diff --git a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java index 0eb2b78..7a7a327 100644 --- a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java +++ b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestLongLivedProcess.java @@ -136,6 +136,8 @@ public class TestLongLivedProcess extends WorkflowServiceTestBase implements private LongLivedProcess initProcess(List<String> commands) { process = new LongLivedProcess(name.getMethodName(), log, commands); process.setLifecycleCallback(this); + // increase the line limit to accommodate containers with long list of envs + process.setRecentLineLimit(640); return process; } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8850d062/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java index bc1476a..71d6cbe 100644 --- a/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java +++ b/slider-core/src/test/java/org/apache/slider/server/services/workflow/TestWorkflowForkedProcessService.java @@ -133,6 +133,8 @@ public class TestWorkflowForkedProcessService extends WorkflowServiceTestBase { process = new ForkedProcessService(name.getMethodName(), env, commands); process.init(new Configuration()); + // increase the line limit to accommodate containers with long list of envs + process.setRecentLineLimit(640); return process; }
