Permalink
Browse files

BIGTOP-555. Bump version of HBase to 0.92.1

git-svn-id: https://svn.apache.org/repos/asf/incubator/bigtop/trunk@1328544 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent f398c77 commit 2a66ea6cffed6ef7639785c4a305c9b447ebf60d rvs committed Apr 21, 2012
@@ -1,73 +0,0 @@
---- 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);
@@ -31,7 +31,6 @@ hbase_jar_deps_hadoop=hadoop-annotations,hadoop-auth,hadoop-common,hadoop-hdfs,h
patch: patch-stamp
patch-stamp:
- patch -p0 < debian/HBASE-5212.patch
touch $@
clean:
@@ -91,7 +91,6 @@ 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-hdfs, zookeeper >= 3.3.1, bigtop-utils
@@ -236,7 +235,6 @@ The Apache HBase REST gateway
%prep
%setup -n %{name}-%{hbase_base_version}
-%patch0 -p0
%build
env HBASE_VERSION=%{version} bash %{SOURCE1}
View
@@ -48,7 +48,7 @@ $(eval $(call PACKAGE,zookeeper,ZOOKEEPER))
HBASE_NAME=hbase
HBASE_RELNOTES_NAME=Apache HBase
HBASE_PKG_NAME=hbase
-HBASE_BASE_VERSION=0.92.0
+HBASE_BASE_VERSION=0.92.1
HBASE_PKG_VERSION=$(HBASE_BASE_VERSION)
HBASE_RELEASE_VERSION=1
HBASE_TARBALL_DST=hbase-$(HBASE_BASE_VERSION).tar.gz

0 comments on commit 2a66ea6

Please sign in to comment.