PIG-4833 Fixing test build failure for hadoop 1.x caused from previous patch (knoguchi)
git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1741439 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezResourceManager.java b/src/org/apache/pig/backend/hadoop/executionengine/tez/TezResourceManager.java
index 13a6c60..9b4538b 100644
--- a/src/org/apache/pig/backend/hadoop/executionengine/tez/TezResourceManager.java
+++ b/src/org/apache/pig/backend/hadoop/executionengine/tez/TezResourceManager.java
@@ -39,6 +39,8 @@
import org.apache.pig.impl.PigContext;
import org.apache.pig.impl.io.FileLocalizer;
+import com.google.common.annotations.VisibleForTesting;
+
public class TezResourceManager {
private static TezResourceManager instance = null;
private boolean inited = false;
@@ -59,6 +61,7 @@
/**
* This method is only used by test code to reset state.
*/
+ @VisibleForTesting
public static void dropInstance() {
instance = null;
}
diff --git a/test/org/apache/pig/test/Util.java b/test/org/apache/pig/test/Util.java
index 8dae247..36d01e8 100644
--- a/test/org/apache/pig/test/Util.java
+++ b/test/org/apache/pig/test/Util.java
@@ -75,7 +75,7 @@
import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.MapReduceLauncher;
import org.apache.pig.backend.hadoop.executionengine.mapReduceLayer.plans.MROperPlan;
import org.apache.pig.backend.hadoop.executionengine.physicalLayer.plans.PhysicalPlan;
-import org.apache.pig.backend.hadoop.executionengine.tez.TezResourceManager;
+import org.apache.pig.backend.hadoop.executionengine.shims.HadoopShims;
import org.apache.pig.backend.hadoop.executionengine.util.MapRedUtil;
import org.apache.pig.builtin.Utf8StorageConverter;
import org.apache.pig.data.BagFactory;
@@ -1344,7 +1344,16 @@
// For tez testing, we want to avoid TezResourceManager/LocalResource reuse
// (when switching between local and mapreduce/tez)
- TezResourceManager.dropInstance();
+ if( HadoopShims.isHadoopYARN() ) {
+ try {
+ java.lang.reflect.Method tez_dropInstance = Class.forName(
+ "org.apache.pig.backend.hadoop.executionengine.tez.TezResourceManager").getDeclaredMethod(
+ "dropInstance", (Class<?>[]) null );
+ tez_dropInstance.invoke(null);
+ } catch (Exception e){
+ throw new RuntimeException(e);
+ }
+ }
// TODO: once we have Tez local mode, we can get rid of this. For now,
// if we run this test suite in Tez mode and there are some tests
