Author: rvs
Date: Fri Feb 17 18:51:32 2012
New Revision: 1245703
URL: http://svn.apache.org/viewvc?rev=1245703&view=rev
Log:
BIGTOP-408. HBase build needs to be worked around in hadoop-0.23 branch
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/HBASE-5212.patch
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/rules
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/HBASE-5212.patch
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/HBASE-5212.patch?rev=1245703&view=auto
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/HBASE-5212.patch
(added)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hbase/HBASE-5212.patch
Fri Feb 17 18:51:32 2012
@@ -0,0 +1,73 @@
+--- pom.xml 2012-01-16 07:03:35.000000000 -0800
++++ pom.xml 2012-02-17 09:46:32.506195389 -0800
+@@ -1788,6 +1788,13 @@
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <version>${hadoop.version}</version>
+ <optional>true</optional>
++ <scope>test</scope>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.hadoop</groupId>
++ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
++ <version>${hadoop.version}</version>
++ <optional>true</optional>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+--- src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
2012-01-16 07:03:40.000000000 -0800
++++ src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
2012-02-17 09:46:32.466194915 -0800
+@@ -423,7 +423,7 @@
+ if (os != null) {
+ try {
+ m = os.getWrappedStream().getClass().
+- getMethod("getNumCurrentReplicas", new Class<?> []{});
++ getDeclaredMethod("getNumCurrentReplicas", new Class<?> []{});
+ m.setAccessible(true);
+ } catch (NoSuchMethodException e) {
+ // Thrown if getNumCurrentReplicas() function isn't available
+@@ -438,7 +438,7 @@
+ LOG.info("Using getNumCurrentReplicas--HDFS-826");
+ } else {
+ LOG.info("getNumCurrentReplicas--HDFS-826 not available; hdfs_out=" +
+- os + ", exception=" + exception.getMessage());
++ os, exception);
+ }
+ return m;
+ }
+--- src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
2012-01-16 07:03:36.000000000 -0800
++++ src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
2012-02-17 09:46:32.446194449 -0800
+@@ -1164,6 +1164,8 @@
+ LOG.info("Mini mapreduce cluster started");
+ c.set("mapred.job.tracker",
+ mrCluster.createJobConf().get("mapred.job.tracker"));
++ /* this for mrv2 support */
++ conf.set("mapreduce.framework.name", "yarn");
+ }
+
+ /**
+--- src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
2012-01-16 07:03:37.000000000 -0800
++++ src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
2012-02-17 09:46:32.436195465 -0800
+@@ -335,13 +335,18 @@
+ // We start 3 servers and then stop 2 to avoid a directory naming conflict
+ // when we stop/start a namenode later, as mentioned in HBASE-5163
+ List<DataNode> existingNodes = dfsCluster.getDataNodes();
+- dfsCluster
+- .startDataNodes(TEST_UTIL.getConfiguration(), 3, true, null, null);
+- for (DataNode dn: existingNodes){
+- dfsCluster.stopDataNode( dn.dnRegistration.getName() );
++ int numDataNodes = 3;
++ dfsCluster.startDataNodes(TEST_UTIL.getConfiguration(), numDataNodes,
true,
++ null, null);
++ List<DataNode> allNodes = dfsCluster.getDataNodes();
++ for (int i = allNodes.size()-1; i >= 0; i--) {
++ if (existingNodes.contains(allNodes.get(i))) {
++ dfsCluster.stopDataNode( i );
++ }
+ }
+
+- assertTrue(
++ assertTrue("DataNodes " + dfsCluster.getDataNodes().size() +
++ " default replication " + fs.getDefaultReplication(),
+ dfsCluster.getDataNodes().size() >= fs.getDefaultReplication() + 1);
+
+ writeData(table, 2);
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/rules?rev=1245703&r1=1245702&r2=1245703&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/rules
(original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/deb/hbase/rules
Fri Feb 17 18:51:32 2012
@@ -31,6 +31,7 @@ hbase_jar_deps_hadoop=hadoop-annotations
patch: patch-stamp
patch-stamp:
+ patch -p0 < debian/HBASE-5212.patch
touch $@
clean:
@@ -40,7 +41,7 @@ clean:
dh_clean
find debian -name .\*swp -exec rm -f {} \;
-build:
+build: patch
dh_testdir
bash debian/do-component-build
-Dmaven.repo.local=${HOME}/.m2/repository
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1245703&r1=1245702&r2=1245703&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
Fri Feb 17 18:51:32 2012
@@ -91,6 +91,7 @@ Source3: hbase.sh
Source4: hbase.sh.suse
Source5: hbase.default
Source6: hbase.nofiles.conf
+Patch0: HBASE-5212.patch
BuildArch: noarch
Requires: coreutils, /usr/sbin/useradd, /sbin/chkconfig, /sbin/service
Requires: hadoop >= 0.20.2, zookeeper >= 3.3.1, bigtop-utils
@@ -210,6 +211,7 @@ Documentation for Hbase
%prep
%setup -n %{name}-%{hbase_base_version}
+%patch0 -p0
%build
env HBASE_VERSION=%{version} bash %{SOURCE1}
