From 335c3fc2927c9503759c0d87d884b1ddc217f129 Mon Sep 17 00:00:00 2001
From: Denis Arnaud <denis.arnaud_fedora(a)m4x.org>
Date: Sun, 31 Jan 2016 20:34:28 +0100
Subject: Fixed the FTBFS on Fedora 24+
---
hadoop-2.4.1-new-bookkeeper.patch | 13 +++++++++++++
hadoop.spec | 8 +++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 hadoop-2.4.1-new-bookkeeper.patch
diff --git a/hadoop-2.4.1-new-bookkeeper.patch b/hadoop-2.4.1-new-bookkeeper.patch
new file mode 100644
index 0000000..832e95e
--- /dev/null
+++ b/hadoop-2.4.1-new-bookkeeper.patch
@@ -0,0 +1,13 @@
+diff -Nru
hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperJournalManager.java
hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510.bookkeeper/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperJournalManager.java
+---
hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperJournalManager.java 2014-06-30
09:04:57.000000000 +0200
++++
hadoop-common-9e2ef43a240fb0f603d8c384e501daec11524510.bookkeeper/hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperJournalManager.java 2016-01-09
13:43:26.831773352 +0100
+@@ -237,7 +237,7 @@
+ zkPathLatch.countDown();
+ }
+ };
+- ZkUtils.createFullPathOptimistic(zkc, zkAvailablePath, new byte[0],
++ ZkUtils.asyncCreateFullPathOptimistic(zkc, zkAvailablePath, new byte[0],
+ Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT, callback, null);
+
+ try {
+
diff --git a/hadoop.spec b/hadoop.spec
index 9c5b2db..9b298f5 100644
--- a/hadoop.spec
+++ b/hadoop.spec
@@ -23,7 +23,7 @@
Name: hadoop
Version: 2.4.1
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: A software platform for processing vast amounts of data
# The BSD license file is missing
#
https://issues.apache.org/jira/browse/HADOOP-9849
@@ -78,6 +78,8 @@ Patch14: hadoop-2.4.1-disable-doclint.patch
Patch15: hadoop-2.4.1-jets3t0.9.3.patch
# add some servlet3.1 missing methods
Patch16: hadoop-2.4.1-servlet-3.1-api.patch
+# Adapt to the new BookKeeper ZkUtils API
+Patch17: hadoop-2.4.1-new-bookkeeper.patch
# This is not a real BR, but is here because of rawhide shift to eclipse
# aether packages which caused a dependency of a dependency to not get
@@ -470,6 +472,7 @@ This package contains files needed to run Apache Hadoop YARN in secure
mode.
%patch14 -p1
%patch15 -p1
%patch16 -p1
+%patch17 -p1
%pom_xpath_set "pom:properties/pom:protobuf.version" 2.6.1 hadoop-project
@@ -1122,6 +1125,9 @@ fi
%attr(6050,root,yarn) %{_bindir}/container-executor
%changelog
+* Sun Jan 31 2016 Denis Arnaud <denis.arnaud(a)fedoraproject.org> 2.4.1-13
+- Fixed the FTBFS on Fedora 24+
+
* Sat Jan 09 2016 Denis Arnaud <denis.arnaud(a)fedoraproject.org> 2.4.1-12
- Fix BZ#1295968: start of tomcat@httpfs
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/hadoop.git/commit/?h=master&id=335...