diff options
| author | Olaf Flebbe <of@oflebbe.de> | 2016-12-17 17:18:16 +0100 |
|---|---|---|
| committer | Olaf Flebbe <of@oflebbe.de> | 2016-12-22 16:20:19 +0100 |
| commit | e7888cb37e2c72cf7540ba15c15a96fca9f9ba94 (patch) | |
| tree | e406e34dba25819fda8df9f84289fbf0d3ea304f /bigtop-packages | |
| parent | 77f53ad5e72fa21b7cd201f5f72cca4563ea9f62 (diff) | |
BIGTOP-2636: Fix giraph after upgrade to Hadoop-2.7.3
Diffstat (limited to 'bigtop-packages')
| -rw-r--r-- | bigtop-packages/src/common/giraph/patch0-GIRAPH-1110.diff | 20 | ||||
| -rw-r--r-- | bigtop-packages/src/rpm/giraph/SPECS/giraph.spec | 3 |
2 files changed, 23 insertions, 0 deletions
diff --git a/bigtop-packages/src/common/giraph/patch0-GIRAPH-1110.diff b/bigtop-packages/src/common/giraph/patch0-GIRAPH-1110.diff new file mode 100644 index 00000000..46798f3b --- /dev/null +++ b/bigtop-packages/src/common/giraph/patch0-GIRAPH-1110.diff @@ -0,0 +1,20 @@ +diff -ur giraph-1.1.0/giraph-core/src/main/java/org/apache/giraph/job/GiraphJob.java giraph-1.1.0_/giraph-core/src/main/java/org/apache/giraph/job/GiraphJob.java +--- giraph-1.1.0/giraph-core/src/main/java/org/apache/giraph/job/GiraphJob.java 2014-11-01 05:25:12.000000000 +0000 ++++ giraph-1.1.0_/giraph-core/src/main/java/org/apache/giraph/job/GiraphJob.java 2016-12-17 17:04:28.834195182 +0000 +@@ -25,7 +25,6 @@ + import org.apache.giraph.conf.ImmutableClassesGiraphConfiguration; + import org.apache.giraph.graph.GraphMapper; + import org.apache.hadoop.conf.Configuration; +-import org.apache.hadoop.ipc.Client; + import org.apache.hadoop.mapreduce.Job; + import org.apache.log4j.Logger; + +@@ -210,7 +209,7 @@ + + // Set the ping interval to 5 minutes instead of one minute + // (DEFAULT_PING_INTERVAL) +- Client.setPingInterval(giraphConfiguration, 60000 * 5); ++ giraphConfiguration.setInt("ipc.ping.interval", 60000 * 5); + + // Should work in MAPREDUCE-1938 to let the user jars/classes + // get loaded first diff --git a/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec b/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec index 1c5d8187..2807e755 100644 --- a/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec +++ b/bigtop-packages/src/rpm/giraph/SPECS/giraph.spec @@ -58,6 +58,7 @@ Source0: %{name}-%{giraph_base_version}.tar.gz Source1: do-component-build Source2: install_%{name}.sh Source3: giraph-site.xml +#BIGTOP_PATCH_FILES Buildarch: noarch Requires: zookeeper, hadoop-client, bigtop-utils >= 0.7 @@ -76,6 +77,8 @@ Documentation for Apache Solr %prep %setup -n %{name}-%{giraph_base_version} +#BIGTOP_PATCH_COMMANDS + %build bash %{SOURCE1} |