tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject tez git commit: TEZ-2489. Disable warn log for Timeline ACL error when tez.allow.disabled.timeline-domains set to true. (Chang Li via hitesh)
Date Thu, 04 Jun 2015 18:21:07 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.7 f08651617 -> ded1b5df5


TEZ-2489. Disable warn log for Timeline ACL error when tez.allow.disabled.timeline-domains
set to true. (Chang Li via hitesh)

(cherry picked from commit c241f40944e9bafd4c3682b001502b5ea7a5e6e8)

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/branch-0.7
Commit: ded1b5df501e27f57a29319668ae4b0a6ddab4d5
Parents: f086516
Author: Hitesh Shah <hitesh@apache.org>
Authored: Thu Jun 4 11:19:46 2015 -0700
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Thu Jun 4 11:21:00 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                | 2 ++
 tez-api/src/main/java/org/apache/tez/client/TezClient.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/ded1b5df/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1cd32a1..508c659 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.7.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2489. Disable warn log for Timeline ACL error when tez.allow.disabled.timeline-domains
set to true.
   TEZ-2528. Tez UI: Column selector buttons gets clipped, and table scroll bar not visible
in mac.
   TEZ-2391. TestVertexImpl timing out at times on jenkins builds.
   TEZ-2509. YarnTaskSchedulerService should not try to allocate containers if AM is shutting
down.
@@ -207,6 +208,7 @@ Release 0.6.2: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2489. Disable warn log for Timeline ACL error when tez.allow.disabled.timeline-domains
set to true.
   TEZ-2509. YarnTaskSchedulerService should not try to allocate containers if AM is shutting
down.
   TEZ-2483. Tez should close task if processor fail
 

http://git-wip-us.apache.org/repos/asf/tez/blob/ded1b5df/tez-api/src/main/java/org/apache/tez/client/TezClient.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/client/TezClient.java b/tez-api/src/main/java/org/apache/tez/client/TezClient.java
index ab76ca8..8120070 100644
--- a/tez-api/src/main/java/org/apache/tez/client/TezClient.java
+++ b/tez-api/src/main/java/org/apache/tez/client/TezClient.java
@@ -318,11 +318,11 @@ public class TezClient {
             atsHistoryACLManagerClassName);
         historyACLPolicyManager.setConf(this.amConfig.getYarnConfiguration());
       } catch (TezUncheckedException e) {
-        LOG.warn("Could not instantiate object for " + atsHistoryACLManagerClassName
-            + ". ACLs cannot be enforced correctly for history data in Timeline", e);
         if (!amConfig.getTezConfiguration().getBoolean(
             TezConfiguration.TEZ_AM_ALLOW_DISABLED_TIMELINE_DOMAINS,
             TezConfiguration.TEZ_AM_ALLOW_DISABLED_TIMELINE_DOMAINS_DEFAULT)) {
+          LOG.warn("Could not instantiate object for " + atsHistoryACLManagerClassName
+                    + ". ACLs cannot be enforced correctly for history data in Timeline",
e);
           throw e;
         }
         historyACLPolicyManager = null;


Mime
View raw message