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

Merged from trunk. HDFS-4286. Changes from BOOKKEEPER-203 broken capability of including bookkeeper-server jar in hidden package of BKJM. Contributed by Rakesh R. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1608771 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Uma Maheswara Rao G 2014-07-08 13:20:51 +00:00
parent edb01aaca4
commit 53c928a8de
3 changed files with 22 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -510,6 +510,9 @@ Release 2.5.0 - UNRELEASED
HDFS-6604. The short-circuit cache doesn't correctly time out replicas that HDFS-6604. The short-circuit cache doesn't correctly time out replicas that
haven't been used in a while (cmccabe) haven't been used in a while (cmccabe)
HDFS-4286. Changes from BOOKKEEPER-203 broken capability of including
bookkeeper-server jar in hidden package of BKJM (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)

38
hadoop-hdfs-project/hadoop-hdfs/src/contrib/bkjournal/pom.xml
View File

@ -163,38 +163,24 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd">
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId>
<artifactId>maven-shade-plugin</artifactId> <version>2.8</version>
<version>1.5</version>
<executions> <executions>
<execution> <execution>
<id>dist</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>shade</goal> <goal>copy</goal>
</goals> </goals>
<configuration> <configuration>
<createDependencyReducedPom>false</createDependencyReducedPom> <artifactItems>
<artifactSet> <artifactItem>
<includes> <groupId>org.apache.bookkeeper</groupId>
<include>org.apache.bookkeeper:bookkeeper-server</include> <artifactId>bookkeeper-server</artifactId>
<include>org.apache.zookeeper:zookeeper</include> <type>jar</type>
<include>org.jboss.netty:netty</include> </artifactItem>
</includes> </artifactItems>
</artifactSet> <outputDirectory>${project.build.directory}/lib</outputDirectory>
<relocations>
<relocation>
<pattern>org.apache.bookkeeper</pattern>
<shadedPattern>hidden.bkjournal.org.apache.bookkeeper</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.zookeeper</pattern>
<shadedPattern>hidden.bkjournal.org.apache.zookeeper</shadedPattern>
</relocation>
<relocation>
<pattern>org.jboss.netty</pattern>
<shadedPattern>hidden.bkjournal.org.jboss.netty</shadedPattern>
</relocation>
</relocations>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

16
hadoop-hdfs-project/hadoop-hdfs/src/site/apt/HDFSHighAvailabilityWithNFS.apt.vm
View File

@ -838,20 +838,18 @@ digest:hdfs-zkfcs:vlUvLnd8MlacsE80rDuu6ONESbM=:rwcda
$ mvn clean package -Pdist $ mvn clean package -Pdist
This will generate a jar with the BookKeeperJournalManager, all the dependencies This will generate a jar with the BookKeeperJournalManager,
needed by the journal manager,
hadoop-hdfs/src/contrib/bkjournal/target/hadoop-hdfs-bkjournal-<VERSION>.jar hadoop-hdfs/src/contrib/bkjournal/target/hadoop-hdfs-bkjournal-<VERSION>.jar
Note that the -Pdist part of the build command is important, as otherwise Note that the -Pdist part of the build command is important, this would
the dependencies would not be packaged in the jar. The dependencies included in copy the dependent bookkeeper-server jar under
the jar are {{{http://maven.apache.org/plugins/maven-shade-plugin/}shaded}} to hadoop-hdfs/src/contrib/bkjournal/target/lib.
avoid conflicts with other dependencies of the NameNode.
*** <<Putting the BookKeeperJournalManager in the NameNode classpath>> *** <<Putting the BookKeeperJournalManager in the NameNode classpath>>
To run a HDFS namenode using BookKeeper as a backend, copy the bkjournal To run a HDFS namenode using BookKeeper as a backend, copy the bkjournal and
jar, generated above, into the lib directory of hdfs. In the standard bookkeeper-server jar, mentioned above, into the lib directory of hdfs. In the
distribution of HDFS, this is at $HADOOP_HDFS_HOME/share/hadoop/hdfs/lib/ standard distribution of HDFS, this is at $HADOOP_HDFS_HOME/share/hadoop/hdfs/lib/
cp hadoop-hdfs/src/contrib/bkjournal/target/hadoop-hdfs-bkjournal-<VERSION>.jar $HADOOP_HDFS_HOME/share/hadoop/hdfs/lib/ cp hadoop-hdfs/src/contrib/bkjournal/target/hadoop-hdfs-bkjournal-<VERSION>.jar $HADOOP_HDFS_HOME/share/hadoop/hdfs/lib/