[
https://issues.apache.org/jira/browse/DRILL-7393?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16985206#comment-16985206
]
ASF GitHub Bot commented on DRILL-7393:
---------------------------------------
paul-rogers commented on pull request #1910: DRILL-7393: Revisit Drill tests to
ensure that patching is executed b…
URL: https://github.com/apache/drill/pull/1910#discussion_r352251049
##########
File path: common/src/main/java/org/apache/drill/common/util/GuavaPatcher.java
##########
@@ -24,154 +24,157 @@
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import javassist.CannotCompileException;
import javassist.ClassPool;
import javassist.CtClass;
import javassist.CtConstructor;
import javassist.CtMethod;
import javassist.CtNewMethod;
-import javassist.NotFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class GuavaPatcher {
private static final Logger logger =
LoggerFactory.getLogger(GuavaPatcher.class);
- private static boolean patched;
+ private static boolean patchingAttempted;
public static synchronized void patch() {
- if (!patched) {
- try {
- patchStopwatch();
- patchCloseables();
- patchPreconditions();
- patched = true;
- } catch (Throwable e) {
- logger.warn("Unable to patch Guava classes.", e);
- }
+ if (!patchingAttempted) {
+ patchingAttempted = true;
+ patchStopwatch();
+ patchCloseables();
+ patchPreconditions();
}
}
/**
* Makes Guava stopwatch look like the old version for compatibility with
hbase-server (for test purposes).
*/
- private static void patchStopwatch() throws Exception {
-
- ClassPool cp = ClassPool.getDefault();
- CtClass cc = cp.get("com.google.common.base.Stopwatch");
-
- // Expose the constructor for Stopwatch for old libraries who use the
pattern new Stopwatch().start().
- for (CtConstructor c : cc.getConstructors()) {
- if (!Modifier.isStatic(c.getModifiers())) {
- c.setModifiers(Modifier.PUBLIC);
+ private static void patchStopwatch() {
+ try {
+ ClassPool cp = ClassPool.getDefault();
+ CtClass cc = cp.get("com.google.common.base.Stopwatch");
+
+ // Expose the constructor for Stopwatch for old libraries who use the
pattern new Stopwatch().start().
+ for (CtConstructor c : cc.getConstructors()) {
+ if (!Modifier.isStatic(c.getModifiers())) {
+ c.setModifiers(Modifier.PUBLIC);
+ }
}
- }
- // Add back the Stopwatch.elapsedMillis() method for old consumers.
- CtMethod newMethod = CtNewMethod.make(
- "public long elapsedMillis() { return
elapsed(java.util.concurrent.TimeUnit.MILLISECONDS); }", cc);
- cc.addMethod(newMethod);
+ // Add back the Stopwatch.elapsedMillis() method for old consumers.
+ CtMethod newMethod = CtNewMethod.make(
+ "public long elapsedMillis() { return
elapsed(java.util.concurrent.TimeUnit.MILLISECONDS); }", cc);
+ cc.addMethod(newMethod);
- // Load the modified class instead of the original.
- cc.toClass();
+ // Load the modified class instead of the original.
+ cc.toClass();
- logger.info("Google's Stopwatch patched for old HBase Guava version.");
+ logger.info("Google's Stopwatch patched for old HBase Guava version.");
+ } catch (Exception e) {
+ logger.warn("Unable to patch Guava classes.", e);
Review comment:
We are warning on errors, but then proceeding. The test that caused this
patch will still run, but presumably will fail. Is this the desired behaviour?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Revisit Drill tests to ensure that patching is executed before any test run
> ---------------------------------------------------------------------------
>
> Key: DRILL-7393
> URL: https://issues.apache.org/jira/browse/DRILL-7393
> Project: Apache Drill
> Issue Type: Task
> Affects Versions: 1.16.0, 1.17.0
> Reporter: Arina Ielchiieva
> Assignee: Anton Gozhiy
> Priority: Major
> Labels: ready-to-commit
>
> Apache Drill patches some Protobuf and Guava classes (see GuavaPatcher,
> ProtobufPatcher), patching should be done before classes to be patched are
> loaded. That's why this operation is executed in static block in Drillbit
> class.
> Some tests in java-exec module use Drillbit class, some extend DrillTest
> class, both of them patch Guava. But there are some tests that do not call
> patcher but load classes to be patched. For example,
> {{org.apache.drill.exec.sql.TestSqlBracketlessSyntax}} loads Guava
> Preconditions class. If such tests run before tests that require patching,
> tests run will fail since patching won't be successful. Patchers code does
> not fail application if patching was not complete, just logs warning
> ({{logger.warn("Unable to patch Guava classes.", e);}}), so sometimes it hard
> to identify unit tests failure root cause.
> We need to revisit all Drill tests to ensure that all of them extend common
> test base class which patchers Protobuf and Guava classes in static block.
> Also refactor Patcher classes to have assert to fail if patching fails during
> unit testing if there are any problems.
> After all tests are revised, we can remove {{metastore-test}} execution from
> main.xml in {{maven-surefire-plugin}} which was added to ensure that all
> Metastore tests run in a separate JVM where patching is done in first place
> since Iceberg Metastore heavily depends on patched Guava Preconditions class.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
