From 0a27187633641bbf35e870c377c1e023a69f47ae Mon Sep 17 00:00:00 2001
From: Laszlo Bodor <bodorlaszlo0202@gmail.com>
Date: Fri, 21 May 2021 12:00:22 +0200
Subject: [PATCH] TEZ-4298: ShuffleHandler is not source compatible with Hadoop
 3.3.0

---
 tez-plugins/tez-aux-services/findbugs-exclude.xml          | 7 ++++++-
 .../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 5b11308f6d..adfd7041a5 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 e73805a1f0..fb28a0f4b1 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
@@ -153,7 +153,6 @@
 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 {
 
@@ -796,9 +795,10 @@ private void recoverJobShuffleInfo(String jobIdStr, byte[] data)
   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();