oozie-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asasv...@apache.org
Subject oozie git commit: OOZIE-2670 Upgrade Hbase to 1.2 (gezapeti via asasvari)
Date Thu, 10 Aug 2017 10:26:18 GMT
Repository: oozie
Updated Branches:
  refs/heads/master 5b3766809 -> 03a4a5e0d


OOZIE-2670 Upgrade Hbase to 1.2 (gezapeti via asasvari)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/03a4a5e0
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/03a4a5e0
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/03a4a5e0

Branch: refs/heads/master
Commit: 03a4a5e0d57b240975f6e8e9fa3300ef1d1b0f20
Parents: 5b37668
Author: Attila Sasvari <asasvari@cloudera.com>
Authored: Thu Aug 10 12:25:14 2017 +0200
Committer: Attila Sasvari <asasvari@cloudera.com>
Committed: Thu Aug 10 12:25:37 2017 +0200

----------------------------------------------------------------------
 core/pom.xml                                                 | 2 +-
 .../org/apache/oozie/action/hadoop/HbaseCredentials.java     | 8 +++++++-
 docs/src/site/twiki/DG_QuickStart.twiki                      | 4 ++--
 docs/src/site/twiki/ENG_Building.twiki                       | 4 ++--
 pom.xml                                                      | 4 ++--
 release-log.txt                                              | 1 +
 6 files changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/03a4a5e0/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 7275775..ea2de53 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -126,7 +126,7 @@
 
         <dependency>
             <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase</artifactId>
+            <artifactId>hbase-client</artifactId>
              <scope>provided</scope>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/oozie/blob/03a4a5e0/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java b/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java
index 22b6dc9..4add5f1 100644
--- a/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java
+++ b/core/src/main/java/org/apache/oozie/action/hadoop/HbaseCredentials.java
@@ -24,6 +24,8 @@ import java.util.Map;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.hbase.client.Connection;
+import org.apache.hadoop.hbase.client.ConnectionFactory;
 import org.apache.hadoop.hbase.security.User;
 import org.apache.hadoop.hbase.security.token.AuthenticationTokenIdentifier;
 import org.apache.hadoop.hbase.security.token.TokenUtil;
@@ -80,7 +82,11 @@ public class HbaseCredentials implements CredentialsProvider {
         Token<AuthenticationTokenIdentifier> token = u.runAs(
             new PrivilegedExceptionAction<Token<AuthenticationTokenIdentifier>>()
{
                 public Token<AuthenticationTokenIdentifier> run() throws Exception
{
-                    return TokenUtil.obtainToken(jobConf);
+                    Token<AuthenticationTokenIdentifier> newToken = null;
+                    try (Connection connection = ConnectionFactory.createConnection(jobConf))
{
+                        newToken = TokenUtil.obtainToken(connection);
+                    }
+                    return newToken;
                 }
             }
         );

http://git-wip-us.apache.org/repos/asf/oozie/blob/03a4a5e0/docs/src/site/twiki/DG_QuickStart.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/DG_QuickStart.twiki b/docs/src/site/twiki/DG_QuickStart.twiki
index daeecdb..7b6e81c 100644
--- a/docs/src/site/twiki/DG_QuickStart.twiki
+++ b/docs/src/site/twiki/DG_QuickStart.twiki
@@ -52,8 +52,8 @@ available to customise the versions of the dependencies:
 -Dopenjpa.version=<version> - default 2.2.2
 -Dxerces.version=<version> - default 2.10.0
 -Dcurator.version=<version> - default 2.5.0
--Dhive.version=<version> - default 0.13.1 for hadoop-1, 1.2.0 for hadoop-2 and hadoop-3
profile
--Dhbase.version=<version> - default 0.94.2
+-Dhive.version=<version - default 1.2.0
+-Dhbase.version=<version> - default 1.2.3
 -Dtez.version=<version> - default 0.8.4
 </verbatim>
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/03a4a5e0/docs/src/site/twiki/ENG_Building.twiki
----------------------------------------------------------------------
diff --git a/docs/src/site/twiki/ENG_Building.twiki b/docs/src/site/twiki/ENG_Building.twiki
index ee772f7..0456cbf 100644
--- a/docs/src/site/twiki/ENG_Building.twiki
+++ b/docs/src/site/twiki/ENG_Building.twiki
@@ -222,8 +222,8 @@ as the execution engine for those applications.
 -Dopenjpa.version=<version> - default 2.2.2
 -Dxerces.version=<version> - default 2.10.0
 -Dcurator.version=<version> - default 2.5.0
--Dhive.version=<version> - default 0.13.1 for hadoop-1, 1.2.0 for hadoop-2 and hadoop-3
profile
--Dhbase.version=<version> - default 0.94.2
+-Dhive.version=<version> - default 1.2.0
+-Dhbase.version=<version> - default 1.2.3
 -Dtez.version=<version> - default 0.8.4
 </verbatim>
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/03a4a5e0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4978d21..4886443 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,7 +81,7 @@
         <hadoop.version>2.6.0</hadoop.version>
         <hadoop.majorversion>2</hadoop.majorversion>
         <hadooplib.version>hadoop-${hadoop.majorversion}-${project.version}</hadooplib.version>
-        <hbase.version>0.94.27</hbase.version>
+        <hbase.version>1.2.3</hbase.version>
 
         <dropwizard.metrics.version>3.1.2</dropwizard.metrics.version>
 
@@ -514,7 +514,7 @@
 
             <dependency>
                 <groupId>org.apache.hbase</groupId>
-                <artifactId>hbase</artifactId>
+                <artifactId>hbase-client</artifactId>
                 <version>${hbase.version}</version>
                 <scope>provided</scope>
                 <exclusions>

http://git-wip-us.apache.org/repos/asf/oozie/blob/03a4a5e0/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 4113b2d..2ac893c 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.0.0 release (trunk - unreleased)
 
+OOZIE-2670 Upgrade Hbase to 1.2 (gezapeti via asasvari)
 OOZIE-2608 Comma in oozie.service.JPAService.jdbc.password value results in authentication
error (gezapeti via asasvari)
 OOZIE-3009 amend Number of Oozie tests executed dropped after OOZIE-2854 (andras.piros via
gezapeti)
 OOZIE-2999 minioozie can't compile (Artem Ervits via gezapeti)


Mime
View raw message