Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mreged from trunk. HDFS-5411. Update Bookkeeper dependency to 4.2.3. Contributed by Rakesh R. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1608786 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uma Maheswara Rao G 2014-07-08 13:54:49 +00:00
parent 2da1a373e3
commit 2d439fd0c1
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -516,6 +516,8 @@ Release 2.5.0 - UNRELEASED
HDFS-4221. Remove the format limitation point from BKJM documentation as HDFS-3810 HDFS-4221. Remove the format limitation point from BKJM documentation as HDFS-3810
closed. (Rakesh R via umamahesh) closed. (Rakesh R via umamahesh)
HDFS-5411. Update Bookkeeper dependency to 4.2.3. (Rakesh R via umamahesh)
BREAKDOWN OF HDFS-2006 SUBTASKS AND RELATED JIRAS BREAKDOWN OF HDFS-2006 SUBTASKS AND RELATED JIRAS
HDFS-6299. Protobuf for XAttr and client-side implementation. (Yi Liu via umamahesh) HDFS-6299. Protobuf for XAttr and client-side implementation. (Yi Liu via umamahesh)

2
hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/main/java/org/apache/hadoop/contrib/bkjournal/BookKeeperJournalManager.java
View File

@ -237,7 +237,7 @@ public class BookKeeperJournalManager implements JournalManager {
zkPathLatch.countDown(); zkPathLatch.countDown();
} }
}; };
ZkUtils.createFullPathOptimistic(zkc, zkAvailablePath, new byte[0], ZkUtils.asyncCreateFullPathOptimistic(zkc, zkAvailablePath, new byte[0],
Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT, callback, null); Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT, callback, null);
try { try {

6
hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/src/test/java/org/apache/hadoop/contrib/bkjournal/BKJMUtil.java
View File

@ -149,13 +149,16 @@ class BKJMUtil {
int checkBookiesUp(int count, int timeout) throws Exception { int checkBookiesUp(int count, int timeout) throws Exception {
ZooKeeper zkc = connectZooKeeper(); ZooKeeper zkc = connectZooKeeper();
try { try {
boolean up = false;
int mostRecentSize = 0; int mostRecentSize = 0;
for (int i = 0; i < timeout; i++) { for (int i = 0; i < timeout; i++) {
try { try {
List<String> children = zkc.getChildren("/ledgers/available", List<String> children = zkc.getChildren("/ledgers/available",
false); false);
mostRecentSize = children.size(); mostRecentSize = children.size();
// Skip 'readonly znode' which is used for keeping R-O bookie details
if (children.contains("readonly")) {
mostRecentSize = children.size() - 1;
}
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug("Found " + mostRecentSize + " bookies up, " LOG.debug("Found " + mostRecentSize + " bookies up, "
+ "waiting for " + count); + "waiting for " + count);
@ -166,7 +169,6 @@ class BKJMUtil {
} }
} }
if (mostRecentSize == count) { if (mostRecentSize == count) {
up = true;
break; break;
} }
} catch (KeeperException e) { } catch (KeeperException e) {

2
hadoop-project/pom.xml
View File

@ -730,7 +730,7 @@
<dependency> <dependency>
<groupId>org.apache.bookkeeper</groupId> <groupId>org.apache.bookkeeper</groupId>
<artifactId>bookkeeper-server</artifactId> <artifactId>bookkeeper-server</artifactId>
<version>4.0.0</version> <version>4.2.3</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>