Permalink
Browse files

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

… solution
  • Loading branch information...
1 parent 368a5a5 commit ca5124d90c0f0c294e6512dd12e5d42bb9602282 @rbpark rbpark committed Mar 11, 2010
@@ -96,13 +96,14 @@ public AzkabanApp(List<File> jobDirs, File logDir, File tempDir, boolean enableD
String hadoopHome = System.getenv("HADOOP_HOME");
if(hadoopHome == null) {
logger.info("HADOOP_HOME not set, using default hadoop config.");
- _baseClassLoader = ClassLoader.getSystemClassLoader();
+ _baseClassLoader = getClass().getClassLoader();
} else {
logger.info("Using hadoop config found in " + hadoopHome);
_baseClassLoader = new URLClassLoader(new URL[] { new File(hadoopHome, "conf").toURL() },
- ClassLoader.getSystemClassLoader());
+ getClass().getClassLoader());
}
+ System.out.println(Utils.getClassLoaderDescriptions(_baseClassLoader));
int workPermits = defaultProps.getInt("total.job.permits", Integer.MAX_VALUE);
this._hdfsUrl = defaultProps.getString("hdfs.instance.url", null);
_jobManager = new JobManager(_logsDir.getAbsolutePath(),
@@ -43,6 +43,7 @@ public JavaJob(JobDescriptor descriptor) {
.getString(CANCEL_METHOD_PARAM, DEFAULT_CANCEL_METHOD);
_progressMethod = _descriptor.getProps().getString(PROGRESS_METHOD_PARAM,
DEFAULT_PROGRESS_METHOD);
+
}
@Override
@@ -84,6 +85,8 @@ public double getProgress() throws Exception {
@Override
public void run() {
+ ClassLoader loader = getClass().getClassLoader();
+
if(Utils.constructorExist(_descriptor.getJobClass(), getId(), _descriptor.getProps())) {
_javaObject = Utils.callConstructor(_descriptor.getJobClass(),
getId(),
@@ -408,7 +408,8 @@ private void loadJobDescriptorsWithoutDependencies(Map<String, JobDescriptor> jo
ClassLoader loader = createClassLoaderForDir(parentClassLoader, currDir);
// now load any files defined in this directory
- for(File f: currDir.listFiles()) {
+ File[] status = currDir.listFiles();
+ for(File f: status) {
if(EXCLUDE_PATHS.contains(f.getName()) || f.getName().startsWith(".")) {
// ignore common files
continue;
View
@@ -20,7 +20,7 @@ name=azkaban
display.name=Azkaban
jvm.suspend=n
-tomcat.manager.url=http://localhost:10000/manager
+tomcat.manager.url=http://localhost:8080/manager
tomcat.manager.username=tomcat
tomcat.manager.password=tomcat
tomcat.context=/azkaban

0 comments on commit ca5124d

Please sign in to comment.