fluo-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] keith-turner closed pull request #1017: fixes #1016 Build w/ any Accumulo w/o setting thrift ver
Date Thu, 01 Jan 1970 00:00:00 GMT
keith-turner closed pull request #1017: fixes #1016 Build w/ any Accumulo w/o setting thrift
ver
URL: https://github.com/apache/fluo/pull/1017
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.travis.yml b/.travis.yml
index 7f0dcf00..4548da82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@
 language: java
 jdk:
   - openjdk8
-script: mvn clean verify javadoc:jar -Daccumulo.version=1.8.1 -Dthrift.version=0.9.3
+script: mvn clean verify javadoc:jar -Daccumulo.version=1.8.1
 notifications:
   irc:
     channels:
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index fdd1f695..ba774f70 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -76,6 +76,7 @@
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
+      <version>0.9.1</version>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index e08daa23..d9a1eb67 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -80,11 +80,6 @@
       <artifactId>hadoop-client</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.thrift</groupId>
-      <artifactId>libthrift</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
diff --git a/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java
b/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java
index 9bcfb17c..ccd9e737 100644
--- a/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java
+++ b/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java
@@ -35,7 +35,8 @@
 import org.apache.fluo.integration.ITBaseImpl;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-import org.apache.thrift.server.THsHaServer;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
@@ -46,9 +47,14 @@
 
 public class OracleIT extends ITBaseImpl {
 
+  private static final String THRIFT_SERVER_LOGGER_NAME =
+      "org.apache.fluo.core.shaded.thrift.server";
+
   @Rule
   public Timeout globalTimeout = Timeout.seconds(getTestTimeout());
 
+  private Level curLevel;
+
   @Test
   public void testRestart() throws Exception {
     OracleClient client = env.getSharedResources().getOracleClient();
@@ -96,6 +102,17 @@ public void run() {
     }
   }
 
+  @Before
+  public void disableLogger() {
+    curLevel = Logger.getLogger(THRIFT_SERVER_LOGGER_NAME).getLevel();
+    Logger.getLogger(THRIFT_SERVER_LOGGER_NAME).setLevel(Level.FATAL);
+  }
+
+  @After
+  public void enableLogger() {
+    Logger.getLogger(THRIFT_SERVER_LOGGER_NAME).setLevel(curLevel);
+  }
+
   /**
    * Test that bogus input into the oracle server doesn't cause an OOM exception. This essentially
    * tests for THRIFT-602
@@ -103,10 +120,6 @@ public void run() {
   @Test
   public void bogusDataTest() throws Exception {
 
-    // we are expecting an error at this point
-    Level curLevel = Logger.getLogger(THsHaServer.class).getLevel();
-    Logger.getLogger(THsHaServer.class).setLevel(Level.FATAL);
-
     Socket socket = new Socket();
     socket.connect(new InetSocketAddress(HostUtil.getHostName(), oserver.getPort()));
     OutputStream outstream = socket.getOutputStream();
@@ -120,8 +133,6 @@ public void bogusDataTest() throws Exception {
     OracleClient client = env.getSharedResources().getOracleClient();
 
     assertEquals(2, client.getStamp().getTxTimestamp());
-
-    Logger.getLogger(THsHaServer.class).setLevel(curLevel);
   }
 
   @Test
diff --git a/pom.xml b/pom.xml
index ccd069e2..ed5bd1aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,6 @@
     <logback.version>1.1.3</logback.version>
     <releaseProfiles>fluo-release</releaseProfiles>
     <slf4j.version>1.7.12</slf4j.version>
-    <thrift.version>0.9.1</thrift.version>
     <twill.version>0.6.0-incubating</twill.version>
     <zookeeper.version>3.4.8</zookeeper.version>
   </properties>
@@ -210,11 +209,6 @@
         <artifactId>hadoop-yarn-client</artifactId>
         <version>${hadoop.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.thrift</groupId>
-        <artifactId>libthrift</artifactId>
-        <version>${thrift.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.twill</groupId>
         <artifactId>twill-api</artifactId>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message