[tez] branch branch-0.9 updated: TEZ-4298: ShuffleHandler is not source compatible with Hadoop 3.3.0 (#129)

[jeagles]

This is an automated email from the ASF dual-hosted git repository.

jeagles pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/tez.git


The following commit(s) were added to refs/heads/branch-0.9 by this push:
     new d328d01  TEZ-4298: ShuffleHandler is not source compatible with Hadoop 
3.3.0 (#129)
d328d01 is described below

commit d328d01dc74b01c38a07a33d37599ff62ac55ccb
Author: Bodor Laszlo <bodorlaszlo0...@gmail.com>
AuthorDate: Tue Jun 22 22:43:08 2021 +0200

    TEZ-4298: ShuffleHandler is not source compatible with Hadoop 3.3.0 (#129)
    
    (cherry picked from commit d443ae2b30fae8a80c98e9e16ec98313ae14dca1)
---
 tez-plugins/tez-aux-services/findbugs-exclude.xml                  | 7 ++++++-
 .../src/main/java/org/apache/tez/auxservices/ShuffleHandler.java   | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tez-plugins/tez-aux-services/findbugs-exclude.xml 
b/tez-plugins/tez-aux-services/findbugs-exclude.xml
index 5b11308..adfd704 100644
--- a/tez-plugins/tez-aux-services/findbugs-exclude.xml
+++ b/tez-plugins/tez-aux-services/findbugs-exclude.xml
@@ -12,5 +12,10 @@
   limitations under the License. See accompanying LICENSE file.
 -->
 <FindBugsFilter>
-
+  <!-- TEZ-4298 -->
+  <Match>
+    <Class name="org.apache.tez.auxservices.ShuffleHandler"/>
+    <Method name="recordJobShuffleInfo"/>
+    <Bug pattern="RV_RETURN_VALUE_IGNORED_NO_SIDE_EFFECT"/>
+  </Match>
 </FindBugsFilter>
diff --git 
a/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java
 
b/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java
index c56a0a8..1bdddde 100644
--- 
a/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java
+++ 
b/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java
@@ -151,7 +151,6 @@ import com.google.common.cache.LoadingCache;
 import com.google.common.cache.RemovalListener;
 import com.google.common.cache.RemovalNotification;
 import com.google.common.cache.Weigher;
-import com.google.protobuf.ByteString;
 
 public class ShuffleHandler extends AuxiliaryService {
 
@@ -790,9 +789,10 @@ public class ShuffleHandler extends AuxiliaryService {
   private void recordJobShuffleInfo(JobID jobId, String user,
       Token<JobTokenIdentifier> jobToken) throws IOException {
     if (stateDb != null) {
+      // Discover type instead of assuming ByteString to allow for shading.
       TokenProto tokenProto = TokenProto.newBuilder()
-          .setIdentifier(ByteString.copyFrom(jobToken.getIdentifier()))
-          .setPassword(ByteString.copyFrom(jobToken.getPassword()))
+          
.setIdentifier(TokenProto.getDefaultInstance().getIdentifier().copyFrom(jobToken.getIdentifier()))
+          
.setPassword(TokenProto.getDefaultInstance().getPassword().copyFrom(jobToken.getPassword()))
           .setKind(jobToken.getKind().toString())
           .setService(jobToken.getService().toString())
           .build();