azkaban-developers

Details

diff --git a/azkaban-common/src/main/java/azkaban/jobExecutor/JavaProcessJob.java b/azkaban-common/src/main/java/azkaban/jobExecutor/JavaProcessJob.java
index 2b2b4a3..134602b 100644
--- a/azkaban-common/src/main/java/azkaban/jobExecutor/JavaProcessJob.java
+++ b/azkaban-common/src/main/java/azkaban/jobExecutor/JavaProcessJob.java
@@ -26,6 +26,7 @@ import azkaban.server.AzkabanServer;
 import azkaban.utils.DirectoryFlowLoader;
 import azkaban.utils.Pair;
 import azkaban.utils.Props;
+import azkaban.utils.Utils;
 
 public class JavaProcessJob extends ProcessJob {
   public static final String CLASSPATH = "classpath";
@@ -154,15 +155,15 @@ public class JavaProcessJob extends ProcessJob {
   protected Pair<Long, Long> getProcMemoryRequirement() throws Exception {
     String strXms = getInitialMemorySize();
     String strXmx = getMaxMemorySize();
-    long xms = azkaban.utils.Utils.parseMemString(strXms);
-    long xmx = azkaban.utils.Utils.parseMemString(strXmx);
+    long xms = Utils.parseMemString(strXms);
+    long xmx = Utils.parseMemString(strXmx);
 
     Props azkabanProperties = AzkabanServer.getAzkabanProperties();
     if (azkabanProperties != null) {
       String maxXms = azkabanProperties.getString(DirectoryFlowLoader.JOB_MAX_XMS, DirectoryFlowLoader.MAX_XMS_DEFAULT);
       String maxXmx = azkabanProperties.getString(DirectoryFlowLoader.JOB_MAX_XMX, DirectoryFlowLoader.MAX_XMX_DEFAULT);
-      long sizeMaxXms = azkaban.utils.Utils.parseMemString(maxXms);
-      long sizeMaxXmx = azkaban.utils.Utils.parseMemString(maxXmx);
+      long sizeMaxXms = Utils.parseMemString(maxXms);
+      long sizeMaxXmx = Utils.parseMemString(maxXmx);
 
       if (xms > sizeMaxXms) {
         throw new Exception(String.format("%s: Xms value has exceeded the allowed limit (max Xms = %s)",
diff --git a/azkaban-common/src/main/java/azkaban/utils/DirectoryFlowLoader.java b/azkaban-common/src/main/java/azkaban/utils/DirectoryFlowLoader.java
index cd370c3..ad7a48f 100644
--- a/azkaban-common/src/main/java/azkaban/utils/DirectoryFlowLoader.java
+++ b/azkaban-common/src/main/java/azkaban/utils/DirectoryFlowLoader.java
@@ -379,20 +379,20 @@ public class DirectoryFlowLoader implements ProjectValidator {
   private void jobPropertiesCheck() {
     String maxXms = props.getString(JOB_MAX_XMS, MAX_XMS_DEFAULT);
     String maxXmx = props.getString(JOB_MAX_XMX, MAX_XMX_DEFAULT);
-    long sizeMaxXms = azkaban.utils.Utils.parseMemString(maxXms);
-    long sizeMaxXmx = azkaban.utils.Utils.parseMemString(maxXmx);
+    long sizeMaxXms = Utils.parseMemString(maxXms);
+    long sizeMaxXmx = Utils.parseMemString(maxXmx);
 
     for (String jobName : jobPropsMap.keySet()) {
       Props jobProps = jobPropsMap.get(jobName);
       String xms = jobProps.getString(XMS, null);
       if (xms != null && !PropsUtils.isVarialbeReplacementPattern(xms) 
-              && azkaban.utils.Utils.parseMemString(xms) > sizeMaxXms) {
+              && Utils.parseMemString(xms) > sizeMaxXms) {
         errors.add(String.format("%s: Xms value has exceeded the allowed limit (max Xms = %s)",
                 jobName, maxXms));
       }
       String xmx = jobProps.getString(XMX, null);
       if (xmx != null && !PropsUtils.isVarialbeReplacementPattern(xmx)
-              && azkaban.utils.Utils.parseMemString(xmx) > sizeMaxXmx) {
+              && Utils.parseMemString(xmx) > sizeMaxXmx) {
         errors.add(String.format("%s: Xmx value has exceeded the allowed limit (max Xmx = %s)",
                 jobName, maxXmx));
       }