azkaban-developers

diff --git a/azkaban-common/src/main/java/azkaban/executor/ExecutionOptions.java b/azkaban-common/src/main/java/azkaban/executor/ExecutionOptions.java
index 366939b..d4cb262 100644
--- a/azkaban-common/src/main/java/azkaban/executor/ExecutionOptions.java
+++ b/azkaban-common/src/main/java/azkaban/executor/ExecutionOptions.java
@@ -62,7 +62,7 @@ public class ExecutionOptions {
   private Integer queueLevel = 0;
   private String concurrentOption = CONCURRENT_OPTION_IGNORE;
   private String mailCreator = DefaultMailCreator.DEFAULT_MAIL_CREATOR;
-  private boolean memoryCheck = false;
+  private boolean memoryCheck = true;
   private Map<String, String> flowParameters = new HashMap<String, String>();
 
   public enum FailureAction {
@@ -263,7 +263,7 @@ public class ExecutionOptions {
     options.setFailureEmailsOverridden(wrapper.getBool(FAILURE_EMAILS_OVERRIDE,
         false));
 
-    options.setMemoryCheck(wrapper.getBool(MEMORY_CHECK, false));
+    options.setMemoryCheck(wrapper.getBool(MEMORY_CHECK, true));
 
     return options;
   }

diff --git a/azkaban-common/src/main/java/azkaban/jobExecutor/ProcessJob.java b/azkaban-common/src/main/java/azkaban/jobExecutor/ProcessJob.java
index bb92e01..18b7ffa 100644
--- a/azkaban-common/src/main/java/azkaban/jobExecutor/ProcessJob.java
+++ b/azkaban-common/src/main/java/azkaban/jobExecutor/ProcessJob.java
@@ -55,7 +55,7 @@ public class ProcessJob extends AbstractProcessJob {
       handleError("Bad property definition! " + e.getMessage(), e);
     }
 
-    if (sysProps.getBoolean(MEMCHECK_ENABLED, true) && jobProps.getBoolean(AZKABAN_MEMORY_CHECK, false)) {
+    if (sysProps.getBoolean(MEMCHECK_ENABLED, true) && jobProps.getBoolean(AZKABAN_MEMORY_CHECK, true)) {
       long freeMemDecrAmt = sysProps.getLong(MEMCHECK_FREEMEMDECRAMT, 0);
       Pair<Long, Long> memPair = getProcMemoryRequirement();
       boolean isMemGranted = SystemMemoryInfo.canSystemGrantMemory(memPair.getFirst(), memPair.getSecond(), freeMemDecrAmt);

diff --git a/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunner.java b/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunner.java
index dd18b3f..779d422 100644
--- a/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunner.java
+++ b/azkaban-execserver/src/main/java/azkaban/execapp/FlowRunner.java
@@ -652,6 +652,11 @@ public class FlowRunner extends EventHandler implements Runnable {
     node.setInputProps(props);
   }
 
+  /**
+   * @param props
+   * This method is to put in any job properties customization before feeding
+   * to the job.
+   */
   private void customizeJobProperties(Props props) {
     boolean memoryCheck = flow.getExecutionOptions().getMemoryCheck();
     props.put(ProcessJob.AZKABAN_MEMORY_CHECK, Boolean.toString(memoryCheck));