Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Reverting changes. Will revisit classpath issue when we find a viable…

… solution
  • Loading branch information...
commit ca5124d90c0f0c294e6512dd12e5d42bb9602282 1 parent 368a5a5
Richard B Park authored
5  azkaban/src/java/azkaban/app/AzkabanApp.java
@@ -96,13 +96,14 @@ public AzkabanApp(List<File> jobDirs, File logDir, File tempDir, boolean enableD
96 96
         String hadoopHome = System.getenv("HADOOP_HOME");
97 97
         if(hadoopHome == null) {
98 98
             logger.info("HADOOP_HOME not set, using default hadoop config.");
99  
-            _baseClassLoader = ClassLoader.getSystemClassLoader();
  99
+            _baseClassLoader = getClass().getClassLoader();
100 100
         } else {
101 101
             logger.info("Using hadoop config found in " + hadoopHome);
102 102
             _baseClassLoader = new URLClassLoader(new URL[] { new File(hadoopHome, "conf").toURL() },
103  
-            		ClassLoader.getSystemClassLoader());
  103
+            		getClass().getClassLoader());
104 104
         }
105 105
 
  106
+        System.out.println(Utils.getClassLoaderDescriptions(_baseClassLoader));
106 107
         int workPermits = defaultProps.getInt("total.job.permits", Integer.MAX_VALUE);
107 108
         this._hdfsUrl = defaultProps.getString("hdfs.instance.url", null);
108 109
         _jobManager = new JobManager(_logsDir.getAbsolutePath(),
3  azkaban/src/java/azkaban/app/JavaJob.java
@@ -43,6 +43,7 @@ public JavaJob(JobDescriptor descriptor) {
43 43
                                    .getString(CANCEL_METHOD_PARAM, DEFAULT_CANCEL_METHOD);
44 44
         _progressMethod = _descriptor.getProps().getString(PROGRESS_METHOD_PARAM,
45 45
                                                            DEFAULT_PROGRESS_METHOD);
  46
+        
46 47
     }
47 48
 
48 49
     @Override
@@ -84,6 +85,8 @@ public double getProgress() throws Exception {
84 85
 
85 86
     @Override
86 87
     public void run() {
  88
+        ClassLoader loader = getClass().getClassLoader();
  89
+    	
87 90
         if(Utils.constructorExist(_descriptor.getJobClass(), getId(), _descriptor.getProps())) {
88 91
             _javaObject = Utils.callConstructor(_descriptor.getJobClass(),
89 92
                                                 getId(),
3  azkaban/src/java/azkaban/app/JobManager.java
@@ -408,7 +408,8 @@ private void loadJobDescriptorsWithoutDependencies(Map<String, JobDescriptor> jo
408 408
         ClassLoader loader = createClassLoaderForDir(parentClassLoader, currDir);
409 409
 
410 410
         // now load any files defined in this directory
411  
-        for(File f: currDir.listFiles()) {
  411
+        File[] status = currDir.listFiles();
  412
+        for(File f: status) {
412 413
             if(EXCLUDE_PATHS.contains(f.getName()) || f.getName().startsWith(".")) {
413 414
                 // ignore common files
414 415
                 continue;
2  build.properties
@@ -20,7 +20,7 @@ name=azkaban
20 20
 display.name=Azkaban
21 21
 jvm.suspend=n
22 22
 
23  
-tomcat.manager.url=http://localhost:10000/manager
  23
+tomcat.manager.url=http://localhost:8080/manager
24 24
 tomcat.manager.username=tomcat
25 25
 tomcat.manager.password=tomcat
26 26
 tomcat.context=/azkaban

0 notes on commit ca5124d

Please sign in to comment.
Something went wrong with that request. Please try again.