Skip to content

Commit 8632911

Browse files
committed
[DRAFT] Upgrade to Tez 0.10.5
1 parent 174ac62 commit 8632911

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

llap-client/src/java/org/apache/hadoop/hive/llap/tezplugins/helpers/LlapTaskUmbilicalServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class LlapTaskUmbilicalServer {
5252
private Map<String, int[]> tokenRefMap = new HashMap<String, int[]>();
5353

5454
public LlapTaskUmbilicalServer(Configuration conf, LlapTaskUmbilicalProtocol umbilical, int numHandlers) throws IOException {
55-
jobTokenSecretManager = new JobTokenSecretManager();
55+
jobTokenSecretManager = new JobTokenSecretManager(conf);
5656

5757
String[] portRange =
5858
conf.get(HiveConf.ConfVars.LLAP_TASK_UMBILICAL_SERVER_PORT.varname)

llap-server/src/java/org/apache/hadoop/hive/llap/shufflehandler/ShuffleHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ public Thread newThread(Runnable r) {
328328
DEFAULT_SHUFFLE_MAPOUTPUT_META_INFO_CACHE_SIZE));
329329

330330
userRsrc = new ConcurrentHashMap<>();
331-
secretManager = new JobTokenSecretManager();
331+
secretManager = new JobTokenSecretManager(conf);
332332
shuffle = new Shuffle(conf);
333333
if (conf.getBoolean(SHUFFLE_DIR_WATCHER_ENABLED, SHUFFLE_DIR_WATCHER_ENABLED_DEFAULT)) {
334334
LOG.info("Attempting to start dirWatcher");

llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskCommunicator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ protected void startRpcServer() {
251251
Configuration conf = getConf();
252252
try {
253253
JobTokenSecretManager jobTokenSecretManager =
254-
new JobTokenSecretManager();
254+
new JobTokenSecretManager(conf);
255255
jobTokenSecretManager.addTokenForJob(tokenIdentifier, sessionToken);
256256

257257
int numHandlers =

llap-tez/src/java/org/apache/hadoop/hive/llap/tezplugins/LlapTaskSchedulerService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ public LlapTaskSchedulerService(TaskSchedulerContext taskSchedulerContext, Clock
372372
Token<JobTokenIdentifier> token = createAmsToken(id);
373373
serializedToken = serializeToken(token);
374374
jobIdForToken = token.getService().toString();
375-
sm = new JobTokenSecretManager();
375+
sm = new JobTokenSecretManager(conf);
376376
sm.addTokenForJob(jobIdForToken, token);
377377
} else {
378378
serializedToken = jobIdForToken = null;
@@ -565,7 +565,7 @@ private static Map<Integer, Set<Integer>> getTransitiveVertexOutputs(DagInfo inf
565565
private static Token<JobTokenIdentifier> createAmsToken(ApplicationId id) {
566566
if (!UserGroupInformation.isSecurityEnabled()) return null;
567567
JobTokenIdentifier identifier = new JobTokenIdentifier(new Text(id.toString()));
568-
JobTokenSecretManager jobTokenManager = new JobTokenSecretManager();
568+
JobTokenSecretManager jobTokenManager = new JobTokenSecretManager(new Configuration());
569569
Token<JobTokenIdentifier> sessionToken = new Token<>(identifier, jobTokenManager);
570570
sessionToken.setService(identifier.getJobId());
571571
return sessionToken;

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
<slf4j.version>1.7.30</slf4j.version>
203203
<ST4.version>4.0.4</ST4.version>
204204
<storage-api.version>4.1.0-SNAPSHOT</storage-api.version>
205-
<tez.version>0.10.4</tez.version>
205+
<tez.version>0.10.5</tez.version>
206206
<super-csv.version>2.2.0</super-csv.version>
207207
<tempus-fugit.version>1.1</tempus-fugit.version>
208208
<snappy.version>1.1.10.4</snappy.version>

ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDTFGetSplits.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ private static Token<JobTokenIdentifier> createJobToken(ApplicationId applicatio
624624
JobTokenIdentifier identifier = new JobTokenIdentifier(new Text(
625625
tokenIdentifier));
626626
Token<JobTokenIdentifier> sessionToken = new Token<JobTokenIdentifier>(identifier,
627-
new JobTokenSecretManager());
627+
new JobTokenSecretManager(new Configuration()));
628628
sessionToken.setService(identifier.getJobId());
629629
return sessionToken;
630630
}

0 commit comments

Comments
 (0)