Changeset 27487

Timestamp:

2013-05-28T09:33:33+12:00 (11 years ago)

Author:

jmt12

Message:

Ensure Parallel Building path in environment (for ThriftFS) and that the appropriate protocol is written to the manifests (HDThriftFS or HDFSShell)

File:

• gs2-extensions/parallel-building/trunk/src/src/java/org/nzdl/gsdl/HadoopGreenstoneIngest.java (modified) (2 diffs)

gs2-extensions/parallel-building/trunk/src/src/java/org/nzdl/gsdl/HadoopGreenstoneIngest.java

@@ -183 +183 @@
       fw1.write("[Host:" + InetAddress.getLocalHost().getHostName() + "]\n");
       fw1.write("[Task:" + task_id + "]\n");
+
+      // Programatically rewrite the protocol as appropriate for the given
+      // archives directory
+      file_path = file_path.replace("hdfs://", hdfs_prefix);
       fw1.write("[Map:" + file_path + " => " + value + "]\n");
 
@@ -223 +227 @@
       import_process_env.put("GSDLEXTS", "parallel-building:tdb-edit:video-and-audio");
       //   - installed extension paths
+      import_process_env.put("GEXTPARALLELBUILDING", gsdlhome + "/ext/parallel-building");
       import_process_env.put("GEXTPARALLELBUILDING_INSTALLED", gsdlhome + "/ext/parallel-building/linux");
+      import_process_env.put("GEXTTDBEDIT_INSTALLED", gsdlhome + "/ext/tdb-edit/linux");
       import_process_env.put("GEXTVIDEO_INSTALLED", gsdlhome + "/ext/video-and-audio/linux");
-      import_process_env.put("GEXTTDBEDIT_INSTALLED", gsdlhome + "/ext/tdb-edit/linux");
       // - Hadoop specific
       import_process_env.put("HADOOP_PREFIX", hadoop_prefix);