You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by sh...@apache.org on 2015/07/31 06:12:47 UTC
oozie git commit: OOZIE-2305 Compile Oozie with Hive-1.2.0 (raviprak
via shwethags)
Repository: oozie
Updated Branches:
refs/heads/master b5524c901 -> 9e4a26602
OOZIE-2305 Compile Oozie with Hive-1.2.0 (raviprak via shwethags)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/9e4a2660
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/9e4a2660
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/9e4a2660
Branch: refs/heads/master
Commit: 9e4a26602a830e33e2228b193c2f7aa0ce992efe
Parents: b5524c9
Author: Shwetha GS <ss...@hortonworks.com>
Authored: Fri Jul 31 09:42:41 2015 +0530
Committer: Shwetha GS <ss...@hortonworks.com>
Committed: Fri Jul 31 09:42:41 2015 +0530
----------------------------------------------------------------------
.../java/org/apache/oozie/dependency/HCatURIHandler.java | 9 +++++++--
core/src/test/java/org/apache/oozie/test/hive/MiniHS2.java | 3 +--
release-log.txt | 1 +
3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/9e4a2660/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java b/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java
index 0e690a0..566d40d 100644
--- a/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java
+++ b/core/src/main/java/org/apache/oozie/dependency/HCatURIHandler.java
@@ -48,6 +48,9 @@ import org.apache.oozie.service.Services;
import org.apache.oozie.service.URIHandlerService;
import org.apache.oozie.util.HCatURI;
import org.apache.oozie.util.XLog;
+import org.apache.hadoop.hive.thrift.DelegationTokenIdentifier;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.security.token.Token;
public class HCatURIHandler implements URIHandler {
@@ -270,8 +273,10 @@ public class HCatURIHandler implements URIHandler {
delegationToken = tokenClient.getDelegationToken(user, UserGroupInformation.getLoginUser()
.getUserName());
// Store Delegation token in the UGI
- ShimLoader.getHadoopShims().setTokenStr(ugi, delegationToken,
- hiveConf.get("hive.metastore.token.signature"));
+ Token<DelegationTokenIdentifier> token = new Token<DelegationTokenIdentifier>();
+ token.decodeFromUrlString(delegationToken);
+ token.setService(new Text(hiveConf.get("hive.metastore.token.signature")));
+ ugi.addToken(token);
}
finally {
if (tokenClient != null)
http://git-wip-us.apache.org/repos/asf/oozie/blob/9e4a2660/core/src/test/java/org/apache/oozie/test/hive/MiniHS2.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/test/hive/MiniHS2.java b/core/src/test/java/org/apache/oozie/test/hive/MiniHS2.java
index c9dfd56..6d663c3 100644
--- a/core/src/test/java/org/apache/oozie/test/hive/MiniHS2.java
+++ b/core/src/test/java/org/apache/oozie/test/hive/MiniHS2.java
@@ -84,7 +84,6 @@ public class MiniHS2 extends AbstractHiveService {
hiveConf.setVar(ConfVars.HIVE_SERVER2_THRIFT_BIND_HOST, getHost());
hiveConf.setIntVar(ConfVars.HIVE_SERVER2_THRIFT_PORT, getBinaryPort());
hiveConf.setIntVar(ConfVars.HIVE_SERVER2_THRIFT_HTTP_PORT, getHttpPort());
- HiveMetaStore.HMSHandler.resetDefaultDBFlag();
Path scratchDir = new Path(baseDfsDir, "scratch");
fs.mkdirs(scratchDir);
@@ -209,4 +208,4 @@ public class MiniHS2 extends AbstractHiveService {
} while (true);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/oozie/blob/9e4a2660/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 2e1586c..b409cdb 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.3.0 release (trunk - unreleased)
+OOZIE-2305 Compile Oozie with Hive-1.2.0 (raviprak via shwethags)
OOZIE-2320 TestZKXLogStreamingService.testStreamingWithMultipleOozieServers_coordActionList is failing (rkanter)
OOZIE-2293 Oozie 4.0.1 build failed while building Catalog (raviprak via shwethags)
OOZIE-2308 Add support for bundle:conf() function (kailongs via rohini)