svn commit: r1906695 - in /pig/trunk: CHANGES.txt ivy.xml ivy/libraries.properties test/org/apache/pig/test/TestHBaseStorage.java

[rohini]

Author: rohini
Date: Mon Jan 16 01:37:26 2023
New Revision: 1906695

URL: http://svn.apache.org/viewvc?rev=1906695&view=rev
Log:
PIG-5433: Fix test failures with TestHBaseStorage and htrace dependency (rohini)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/ivy.xml
    pig/trunk/ivy/libraries.properties
    pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1906695&r1=1906694&r2=1906695&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Jan 16 01:37:26 2023
@@ -116,6 +116,8 @@ OPTIMIZATIONS
  
 BUG FIXES
 
+PIG-5433: Fix test failures with TestHBaseStorage and htrace dependency 
(rohini)
+
 PIG-5430: TestTezGraceParallelism failing due to tez log change (knoguchi)
 
 PIG-5406: TestJoinLocal imports org.python.google.common.collect.Lists instead 
of org.google.common.collect.Lists (rohini)

Modified: pig/trunk/ivy.xml
URL: 
http://svn.apache.org/viewvc/pig/trunk/ivy.xml?rev=1906695&r1=1906694&r2=1906695&view=diff
==============================================================================
--- pig/trunk/ivy.xml (original)
+++ pig/trunk/ivy.xml Mon Jan 16 01:37:26 2023
@@ -475,7 +475,7 @@
       <exclude org="asm" module="asm"/>
     </dependency>
 
-    <dependency org="org.apache.htrace" name="htrace-core4" 
rev="${htrace4.version}" conf="hbase2->master">
+    <dependency org="org.apache.htrace" name="htrace-core4" 
rev="${htrace4.version}" conf="hadoop2->master;hadoop3->master;hbase2->master">
       <artifact name="htrace-core4" type="jar"/>
     </dependency>
 
@@ -507,7 +507,6 @@
     <dependency org="com.lmax" name="disruptor" rev="3.3.6" 
conf="hbase2->master"/>
     <!-- End of HBase dependencies -->
 
-    <dependency org="org.htrace" name="htrace-core" rev="3.0.4" 
conf="hadoop2->master;hadoop3->master"/>
     <dependency org="org.apache.htrace" name="htrace-core" 
rev="${htrace.version}"
         conf="hadoop2->master;hadoop3->master;hbase1->master"/>
     <dependency org="org.fusesource.leveldbjni" name="leveldbjni-all" 
rev="${leveldbjni.version}"

Modified: pig/trunk/ivy/libraries.properties
URL: 
http://svn.apache.org/viewvc/pig/trunk/ivy/libraries.properties?rev=1906695&r1=1906694&r2=1906695&view=diff
==============================================================================
--- pig/trunk/ivy/libraries.properties (original)
+++ pig/trunk/ivy/libraries.properties Mon Jan 16 01:37:26 2023
@@ -88,7 +88,7 @@ snappy.version=0.2
 leveldbjni.version=1.8
 curator.version=2.6.0
 htrace.version=3.2.0-incubating
-htrace4.version=4.0.1-incubating
+htrace4.version=4.2.0-incubating
 commons-lang3.version=3.12.0
 scala-xml.version=1.0.5
 glassfish.el.version=3.0.1-b08

Modified: pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java?rev=1906695&r1=1906694&r2=1906695&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestHBaseStorage.java Mon Jan 16 
01:37:26 2023
@@ -103,6 +103,7 @@ public class TestHBaseStorage {
         conf.set("hbase.localcluster.assign.random.ports", "true");
 
         util = new HBaseTestingUtility(conf);
+        System.setProperty("zookeeper.4lw.commands.whitelist", "stat");
         util.startMiniZKCluster();
         util.startMiniHBaseCluster(1, 1);
         connection = ConnectionFactory.createConnection(conf);
@@ -119,6 +120,7 @@ public class TestHBaseStorage {
             hbc.join();
         }
         util.shutdownMiniZKCluster();
+        System.clearProperty("zookeeper.4lw.commands.whitelist");
     }