giraph-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject git commit: updated refs/heads/trunk to b8de740
Date Tue, 05 Nov 2013 18:51:26 GMT
Updated Branches:
  refs/heads/trunk f2b28e14b -> b8de740e2


GIRAPH-791: HiveGiraphRunner picks -D options too late (majakabiljo)


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/b8de740e
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/b8de740e
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/b8de740e

Branch: refs/heads/trunk
Commit: b8de740e20a2dc24db4a9acf5b3ae5affd28d8e9
Parents: f2b28e1
Author: Maja Kabiljo <majakabiljo@fb.com>
Authored: Tue Nov 5 13:50:46 2013 -0500
Committer: Maja Kabiljo <majakabiljo@fb.com>
Committed: Tue Nov 5 13:50:46 2013 -0500

----------------------------------------------------------------------
 CHANGELOG                                                      | 2 ++
 .../src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/b8de740e/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 7df5b3e..d970fa3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 Giraph Change Log
 
 Release 1.1.0 - unreleased
+  GIRAPH-791: HiveGiraphRunner picks -D options too late (majakabiljo)
+
   GIRAPH-790: Add a way to automatically retry a job (majakabiljo)
 
   GIRAPH-789: Upgrade hive-io to 0.20 - less metastore accesses (majakabiljo)

http://git-wip-us.apache.org/repos/asf/giraph/blob/b8de740e/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java
----------------------------------------------------------------------
diff --git a/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java b/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java
index cbcd788..723a48b 100644
--- a/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java
+++ b/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java
@@ -444,6 +444,9 @@ public class HiveGiraphRunner implements Tool {
       throw new InterruptedException();
     }
 
+    // pick up -hiveconf arguments (put -D arguments from command line to conf)
+    HiveUtils.processHiveconfOptions(cmdln.getOptionValues("hiveconf"), conf);
+
     // Giraph classes
     String computationClassStr = cmdln.getOptionValue("computationClass");
     if (computationClassStr != null) {
@@ -544,9 +547,6 @@ public class HiveGiraphRunner implements Tool {
 
     isVerbose = cmdln.hasOption("verbose");
 
-    // pick up -hiveconf arguments
-    HiveUtils.processHiveconfOptions(cmdln.getOptionValues("hiveconf"), conf);
-
     processMoreArguments(cmdln);
 
     return cmdln;


Mime
View raw message