Index: src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java =================================================================== --- src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java (revision 1166697) +++ src/java/org/apache/hcatalog/mapreduce/HCatOutputFormat.java (working copy) @@ -248,9 +248,11 @@ } String jcTokenSignature = "jc."+tokenSignature; - if(tokenMap.get(jcTokenSignature) == null) { - tokenMap.put(jcTokenSignature, - HCatUtil.getJobTrackerDelegationToken(conf,ugi.getUserName())); + if (harRequested){ + if(tokenMap.get(jcTokenSignature) == null) { + tokenMap.put(jcTokenSignature, + HCatUtil.getJobTrackerDelegationToken(conf,ugi.getUserName())); + } } job.getCredentials().addToken(new Text(ugi.getUserName() + tokenSignature), @@ -258,15 +260,20 @@ // this will be used by the outputcommitter to pass on to the metastore client // which in turn will pass on to the TokenSelector so that it can select // the right token. - job.getCredentials().addToken(new Text(ugi.getUserName() + jcTokenSignature), - tokenMap.get(jcTokenSignature)); - job.getConfiguration().set(HCatConstants.HCAT_KEY_TOKEN_SIGNATURE, tokenSignature); - job.getConfiguration().set(HCatConstants.HCAT_KEY_JOBCLIENT_TOKEN_SIGNATURE, jcTokenSignature); - job.getConfiguration().set(HCatConstants.HCAT_KEY_JOBCLIENT_TOKEN_STRFORM, tokenMap.get(jcTokenSignature).encodeToUrlString()); -// LOG.info("Set hive dt["+tokenSignature+"]"); -// LOG.info("Set jt dt["+jcTokenSignature+"]"); + if (harRequested){ + job.getCredentials().addToken(new Text(ugi.getUserName() + jcTokenSignature), + tokenMap.get(jcTokenSignature)); + + job.getConfiguration().set( + HCatConstants.HCAT_KEY_JOBCLIENT_TOKEN_SIGNATURE, jcTokenSignature); + job.getConfiguration().set( + HCatConstants.HCAT_KEY_JOBCLIENT_TOKEN_STRFORM, + tokenMap.get(jcTokenSignature).encodeToUrlString()); + // LOG.info("Set hive dt["+tokenSignature+"]"); + // LOG.info("Set jt dt["+jcTokenSignature+"]"); + } } } } catch(Exception e) { Index: src/java/org/apache/hcatalog/mapreduce/HCatOutputCommitter.java =================================================================== --- src/java/org/apache/hcatalog/mapreduce/HCatOutputCommitter.java (revision 1166697) +++ src/java/org/apache/hcatalog/mapreduce/HCatOutputCommitter.java (working copy) @@ -171,13 +171,13 @@ (HCatConstants.HCAT_KEY_TOKEN_SIGNATURE) != null) { client.cancelDelegationToken(tokenStrForm); } - - String jcTokenStrForm = jobContext.getConfiguration().get(HCatConstants.HCAT_KEY_JOBCLIENT_TOKEN_STRFORM); - String jcTokenSignature = jobContext.getConfiguration().get(HCatConstants.HCAT_KEY_JOBCLIENT_TOKEN_SIGNATURE); - if(jcTokenStrForm != null && jcTokenSignature != null) { - HCatUtil.cancelJobTrackerDelegationToken(tokenStrForm,jcTokenSignature); + if (harProcessor.isEnabled()){ + String jcTokenStrForm = jobContext.getConfiguration().get(HCatConstants.HCAT_KEY_JOBCLIENT_TOKEN_STRFORM); + String jcTokenSignature = jobContext.getConfiguration().get(HCatConstants.HCAT_KEY_JOBCLIENT_TOKEN_SIGNATURE); + if(jcTokenStrForm != null && jcTokenSignature != null) { + HCatUtil.cancelJobTrackerDelegationToken(tokenStrForm,jcTokenSignature); + } } - } catch(Exception e) { if( e instanceof HCatException ) { throw (HCatException) e; @@ -376,12 +376,14 @@ client.cancelDelegationToken(tokenStrForm); } - String jcTokenStrForm = - context.getConfiguration().get(HCatConstants.HCAT_KEY_JOBCLIENT_TOKEN_STRFORM); - String jcTokenSignature = - context.getConfiguration().get(HCatConstants.HCAT_KEY_JOBCLIENT_TOKEN_SIGNATURE); - if(jcTokenStrForm != null && jcTokenSignature != null) { - HCatUtil.cancelJobTrackerDelegationToken(tokenStrForm,jcTokenSignature); + if (harProcessor.isEnabled()){ + String jcTokenStrForm = + context.getConfiguration().get(HCatConstants.HCAT_KEY_JOBCLIENT_TOKEN_STRFORM); + String jcTokenSignature = + context.getConfiguration().get(HCatConstants.HCAT_KEY_JOBCLIENT_TOKEN_SIGNATURE); + if(jcTokenStrForm != null && jcTokenSignature != null) { + HCatUtil.cancelJobTrackerDelegationToken(tokenStrForm,jcTokenSignature); + } } } catch (Exception e) {