SDC-1656 - Deadlock in SDC due to memory monitoring

Change-Id: I820cf97255ad87a3826065c2f3d63ecc2b93aae6 Reviewed-on: https://review.streamsets.net/1182 Reviewed-by: Virag Kothari <virag@streamsets.com> Tested-by: StreamSets CI <streamsets-ci-spam@streamsets.com>
kiritbasu · Sep 2, 2015 · 9e8deae · 9e8deae
1 parent 984eaa5
commit 9e8deae
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/container/src/main/java/com/streamsets/datacollector/runner/StagePipe.java b/container/src/main/java/com/streamsets/datacollector/runner/StagePipe.java
@@ -99,7 +99,7 @@ public List<Issue> init(StagePipe.Context pipeContext) throws StageException {
         }
       }
       this.context = pipeContext;
-      if (configuration.get("monitor.memory", true)) {
+      if (configuration.get("monitor.memory", false)) {
         LOG.info("Starting memory collector for {}", getStage().getInfo().getInstanceName());
         scheduledExecutorService.submit(
           new MemoryMonitor(memoryConsumedCounter,

diff --git a/dist/src/main/etc/sdc.properties b/dist/src/main/etc/sdc.properties
@@ -114,9 +114,6 @@ xmail.password=@email-password.txt@
 # FROM email address to use for the messages
 xmail.from.address=sdc@$localhost
 
-# Monitor memory of stages
-monitor.memory=true
-
 #Value of this property is used to create email message with a link to the console.
 #By default the hostname is used.
 #sdc.base.http.url=http://localhost:18630