ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests#14210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lidavidm merged 1 commit into from
Sep 23, 2022
Merged

ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests #14210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions java/flight/flight-sql-jdbc-driver/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,12 +96,6 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>me.alexpanov</groupId>
<artifactId>free-port-finder</artifactId>
<version>1.1.1</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>commons-io</groupId>
Expand Down
18 changes: 16 additions & 2 deletions ...driver/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
import org.apache.arrow.flight.FlightEndpoint;
import org.apache.arrow.flight.FlightInfo;
import org.apache.arrow.flight.FlightRuntimeException;
import org.apache.arrow.flight.FlightStatusCode;
import org.apache.arrow.flight.FlightStream;
import org.apache.arrow.flight.Location;
import org.apache.arrow.flight.auth2.BearerCredentialWriter;
Expand All@@ -49,12 +50,14 @@
import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.calcite.avatica.Meta.StatementType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* A {@link FlightSqlClient} handler.
*/
public final class ArrowFlightSqlClientHandler implements AutoCloseable {

private static final Logger LOGGER = LoggerFactory.getLogger(ArrowFlightSqlClientHandler.class);
private final FlightSqlClient sqlClient;
private final Set<CallOption> options = new HashSet<>();

Expand DownExpand Up@@ -189,7 +192,18 @@ public Schema getDataSetSchema() {

@Override
public void close() {
preparedStatement.close(getOptions());
try {
preparedStatement.close(getOptions());
} catch (FlightRuntimeException fre) {
// ARROW-17785: suppress exceptions caused by flaky gRPC layer
if (fre.status().code().equals(FlightStatusCode.UNAVAILABLE) ||
(fre.status().code().equals(FlightStatusCode.INTERNAL) &&
fre.getMessage().contains("Connection closed after GOAWAY"))) {
LOGGER.warn("Supressed error closing PreparedStatement", fre);
return;
}
throw fre;
}
}
};
}
Expand Down
2 changes: 0 additions & 2 deletions ...c/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSourceTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,6 @@ public class ArrowFlightJdbcConnectionPoolDataSourceTest {
.build();

FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
.host("localhost")
.randomPort()
.authentication(authentication)
.producer(PRODUCER)
.build();
Expand Down
6 changes: 4 additions & 2 deletions ...sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,10 @@ public class ArrowFlightJdbcDriverTest {
new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
.build();

FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
.authentication(authentication).producer(PRODUCER).build();
FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
.authentication(authentication)
.producer(PRODUCER)
.build();
}

private BufferAllocator allocator;
Expand Down
6 changes: 4 additions & 2 deletions ...ql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactoryTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,10 @@ public class ArrowFlightJdbcFactoryTest {
new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
.build();

FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
.authentication(authentication).producer(PRODUCER).build();
FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
.authentication(authentication)
.producer(PRODUCER)
.build();
}

private BufferAllocator allocator;
Expand Down
6 changes: 4 additions & 2 deletions ...ght/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -56,8 +56,10 @@ public class ConnectionTest {
.user(userTest, passTest)
.build();

FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
.authentication(authentication).producer(PRODUCER).build();
FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
.authentication(authentication)
.producer(PRODUCER)
.build();
}

private BufferAllocator allocator;
Expand Down
2 changes: 0 additions & 2 deletions .../flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ public class ConnectionTlsTest {
.build();

FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
.host("localhost")
.randomPort()
.authentication(authentication)
.useEncryption(certKey.cert, certKey.key)
.producer(PRODUCER)
Expand Down
61 changes: 8 additions & 53 deletions ...ight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/FlightServerTestRule.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import me.alexpanov.net.FreePortFinder;

/**
* Utility class for unit tests that need to instantiate a {@link FlightServer}
* and interact with it.
Expand DownExpand Up@@ -95,8 +93,6 @@ public static FlightServerTestRule createStandardTestRule(final FlightSqlProduce
.build();

return new Builder()
.host("localhost")
.randomPort()
.authentication(authentication)
.producer(producer)
.build();
Expand All@@ -106,11 +102,6 @@ ArrowFlightJdbcDataSource createDataSource() {
return ArrowFlightJdbcDataSource.createNewDataSource(properties);
}

ArrowFlightJdbcDataSource createDataSource(String token) {
properties.put("token", token);
return ArrowFlightJdbcDataSource.createNewDataSource(properties);
}

public ArrowFlightJdbcConnectionPoolDataSource createConnectionPoolDataSource() {
return ArrowFlightJdbcConnectionPoolDataSource.createNewDataSource(properties);
}
Expand DownExpand Up@@ -159,9 +150,8 @@ public Statement apply(Statement base, Description description) {
return new Statement() {
@Override
public void evaluate() throws Throwable {
try (FlightServer flightServer =
getStartServer(location ->
initiateServer(location), 3)) {
try (FlightServer flightServer = getStartServer(location -> initiateServer(location), 3)) {
properties.put("port", flightServer.getPort());
LOGGER.info("Started " + FlightServer.class.getName() + " as " + flightServer);
base.evaluate();
} finally {
Expand All@@ -174,12 +164,9 @@ public void evaluate() throws Throwable {
private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newServerFromLocation,
int retries)
throws IOException {

final Deque<ReflectiveOperationException> exceptions = new ArrayDeque<>();

for (; retries > 0; retries--) {
final Location location = Location.forGrpcInsecure(config.getHost(), config.getPort());
final FlightServer server = newServerFromLocation.apply(location);
final FlightServer server = newServerFromLocation.apply(Location.forGrpcInsecure("localhost", 0));
try {
Method start = server.getClass().getMethod("start");
start.setAccessible(true);
Expand All@@ -189,9 +176,7 @@ private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newS
exceptions.add(e);
}
}

exceptions.forEach(
e -> LOGGER.error("Failed to start a new " + FlightServer.class.getName() + ".", e));
exceptions.forEach(e -> LOGGER.error("Failed to start FlightServer", e));
throw new IOException(exceptions.pop().getCause());
}

Expand DownExpand Up@@ -223,44 +208,14 @@ public void close() throws Exception {
* Builder for {@link FlightServerTestRule}.
*/
public static final class Builder {
private final Properties properties = new Properties();
private final Properties properties;
private FlightSqlProducer producer;
private Authentication authentication;
private CertKeyPair certKeyPair;

/**
* Sets the host for the server rule.
*
* @param host the host value.
* @return the Builder.
*/
public Builder host(final String host) {
properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.HOST.camelName(),
host);
return this;
}

/**
* Sets a random port to be used by the server rule.
*
* @return the Builder.
*/
public Builder randomPort() {
properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
FreePortFinder.findFreeLocalPort());
return this;
}

/**
* Sets a specific port to be used by the server rule.
*
* @param port the port value.
* @return the Builder.
*/
public Builder port(final int port) {
properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
port);
return this;
public Builder() {
this.properties = new Properties();
this.properties.put("host", "localhost");
}

/**
Expand Down
1 change: 0 additions & 1 deletion ...ight/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ResultSetTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,6 @@ public void testShouldRunSelectQuerySettingLargeMaxRowLimit() throws Exception {
try (Statement statement = connection.createStatement();
ResultSet resultSet = statement.executeQuery(
CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {

final long maxRowsLimit = 3;
statement.setLargeMaxRows(maxRowsLimit);

Expand Down
2 changes: 0 additions & 2 deletions ...t-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/TokenAuthenticationTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ public class TokenAuthenticationTest {

static {
FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
.host("localhost")
.randomPort()
.authentication(new TokenAuthentication.Builder()
.token("1234")
.build())
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests#14210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 1 commit into

from

Sep 23, 2022
 Merged


ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests
#14210
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 0 additions & 6 deletions
java/flight/flight-sql-jdbc-driver/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,12 +96,6 @@
 <version>1.3</version>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>me.alexpanov</groupId>
 <artifactId>free-port-finder</artifactId>
 <version>1.1.1</version>
 <scope>test</scope>
 </dependency>

 <dependency>
 <groupId>commons-io</groupId>
Expand Down

18 changes: 16 additions & 2 deletions
...driver/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
import org.apache.arrow.flight.FlightEndpoint;
import org.apache.arrow.flight.FlightInfo;
import org.apache.arrow.flight.FlightRuntimeException;
import org.apache.arrow.flight.FlightStatusCode;
import org.apache.arrow.flight.FlightStream;
import org.apache.arrow.flight.Location;
import org.apache.arrow.flight.auth2.BearerCredentialWriter;
Expand All@@ -49,12 +50,14 @@
import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.calcite.avatica.Meta.StatementType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
 * A {@link FlightSqlClient} handler.
 */
public final class ArrowFlightSqlClientHandler implements AutoCloseable {

 private static final Logger LOGGER = LoggerFactory.getLogger(ArrowFlightSqlClientHandler.class);
 private final FlightSqlClient sqlClient;
 private final Set<CallOption> options = new HashSet<>();

Expand DownExpand Up@@ -189,7 +192,18 @@ public Schema getDataSetSchema() {

 @Override
 public void close() {
 preparedStatement.close(getOptions());
 try {
 preparedStatement.close(getOptions());
 } catch (FlightRuntimeException fre) {
 // ARROW-17785: suppress exceptions caused by flaky gRPC layer
 if (fre.status().code().equals(FlightStatusCode.UNAVAILABLE) ||
 (fre.status().code().equals(FlightStatusCode.INTERNAL) &&
 fre.getMessage().contains("Connection closed after GOAWAY"))) {
 LOGGER.warn("Supressed error closing PreparedStatement", fre);
 return;
 }
 throw fre;
 }
 }
 };
 }
Expand Down

2 changes: 0 additions & 2 deletions
...c/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSourceTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,6 @@ public class ArrowFlightJdbcConnectionPoolDataSourceTest {
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
Expand Down

6 changes: 4 additions & 2 deletions
...sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,10 @@ public class ArrowFlightJdbcDriverTest {
 new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

6 changes: 4 additions & 2 deletions
...ql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,10 @@ public class ArrowFlightJdbcFactoryTest {
 new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

6 changes: 4 additions & 2 deletions
...ght/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,8 +56,10 @@ public class ConnectionTest {
 .user(userTest, passTest)
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

2 changes: 0 additions & 2 deletions
.../flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ public class ConnectionTlsTest {
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .useEncryption(certKey.cert, certKey.key)
 .producer(PRODUCER)
Expand Down

61 changes: 8 additions & 53 deletions
...ight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/FlightServerTestRule.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import me.alexpanov.net.FreePortFinder;

/**
 * Utility class for unit tests that need to instantiate a {@link FlightServer}
 * and interact with it.
Expand DownExpand Up@@ -95,8 +93,6 @@ public static FlightServerTestRule createStandardTestRule(final FlightSqlProduce
 .build();

 return new Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .producer(producer)
 .build();
Expand All@@ -106,11 +102,6 @@ ArrowFlightJdbcDataSource createDataSource() {
 return ArrowFlightJdbcDataSource.createNewDataSource(properties);
 }

 ArrowFlightJdbcDataSource createDataSource(String token) {
 properties.put("token", token);
 return ArrowFlightJdbcDataSource.createNewDataSource(properties);
 }

 public ArrowFlightJdbcConnectionPoolDataSource createConnectionPoolDataSource() {
 return ArrowFlightJdbcConnectionPoolDataSource.createNewDataSource(properties);
 }
Expand DownExpand Up@@ -159,9 +150,8 @@ public Statement apply(Statement base, Description description) {
 return new Statement() {
 @Override
 public void evaluate() throws Throwable {
 try (FlightServer flightServer =
 getStartServer(location ->
 initiateServer(location), 3)) {
 try (FlightServer flightServer = getStartServer(location -> initiateServer(location), 3)) {
 properties.put("port", flightServer.getPort());
 LOGGER.info("Started " + FlightServer.class.getName() + " as " + flightServer);
 base.evaluate();
 } finally {
Expand All@@ -174,12 +164,9 @@ public void evaluate() throws Throwable {
 private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newServerFromLocation,
 int retries)
 throws IOException {

 final Deque<ReflectiveOperationException> exceptions = new ArrayDeque<>();

 for (; retries > 0; retries--) {
 final Location location = Location.forGrpcInsecure(config.getHost(), config.getPort());
 final FlightServer server = newServerFromLocation.apply(location);
 final FlightServer server = newServerFromLocation.apply(Location.forGrpcInsecure("localhost", 0));
 try {
 Method start = server.getClass().getMethod("start");
 start.setAccessible(true);
Expand All@@ -189,9 +176,7 @@ private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newS
 exceptions.add(e);
 }
 }

 exceptions.forEach(
 e -> LOGGER.error("Failed to start a new " + FlightServer.class.getName() + ".", e));
 exceptions.forEach(e -> LOGGER.error("Failed to start FlightServer", e));
 throw new IOException(exceptions.pop().getCause());
 }

Expand DownExpand Up@@ -223,44 +208,14 @@ public void close() throws Exception {
 * Builder for {@link FlightServerTestRule}.
 */
 public static final class Builder {
 private final Properties properties = new Properties();
 private final Properties properties;
 private FlightSqlProducer producer;
 private Authentication authentication;
 private CertKeyPair certKeyPair;

 /**
 * Sets the host for the server rule.
 *
 * @param host the host value.
 * @return the Builder.
 */
 public Builder host(final String host) {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.HOST.camelName(),
 host);
 return this;
 }

 /**
 * Sets a random port to be used by the server rule.
 *
 * @return the Builder.
 */
 public Builder randomPort() {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
 FreePortFinder.findFreeLocalPort());
 return this;
 }

 /**
 * Sets a specific port to be used by the server rule.
 *
 * @param port the port value.
 * @return the Builder.
 */
 public Builder port(final int port) {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
 port);
 return this;
 public Builder() {
 this.properties = new Properties();
 this.properties.put("host", "localhost");
 }

 /**
Expand Down

1 change: 0 additions & 1 deletion
...ight/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ResultSetTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,6 @@ public void testShouldRunSelectQuerySettingLargeMaxRowLimit() throws Exception {
 try (Statement statement = connection.createStatement();
 ResultSet resultSet = statement.executeQuery(
 CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {

 final long maxRowsLimit = 3;
 statement.setLargeMaxRows(maxRowsLimit);

Expand Down

2 changes: 0 additions & 2 deletions
...t-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/TokenAuthenticationTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ public class TokenAuthenticationTest {

 static {
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(new TokenAuthentication.Builder()
 .token("1234")
 .build())
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests#14210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 1 commit into

from

Sep 23, 2022
 Merged


ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests
#14210
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 0 additions & 6 deletions
java/flight/flight-sql-jdbc-driver/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,12 +96,6 @@
 <version>1.3</version>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>me.alexpanov</groupId>
 <artifactId>free-port-finder</artifactId>
 <version>1.1.1</version>
 <scope>test</scope>
 </dependency>

 <dependency>
 <groupId>commons-io</groupId>
Expand Down

18 changes: 16 additions & 2 deletions
...driver/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
import org.apache.arrow.flight.FlightEndpoint;
import org.apache.arrow.flight.FlightInfo;
import org.apache.arrow.flight.FlightRuntimeException;
import org.apache.arrow.flight.FlightStatusCode;
import org.apache.arrow.flight.FlightStream;
import org.apache.arrow.flight.Location;
import org.apache.arrow.flight.auth2.BearerCredentialWriter;
Expand All@@ -49,12 +50,14 @@
import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.calcite.avatica.Meta.StatementType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
 * A {@link FlightSqlClient} handler.
 */
public final class ArrowFlightSqlClientHandler implements AutoCloseable {

 private static final Logger LOGGER = LoggerFactory.getLogger(ArrowFlightSqlClientHandler.class);
 private final FlightSqlClient sqlClient;
 private final Set<CallOption> options = new HashSet<>();

Expand DownExpand Up@@ -189,7 +192,18 @@ public Schema getDataSetSchema() {

 @Override
 public void close() {
 preparedStatement.close(getOptions());
 try {
 preparedStatement.close(getOptions());
 } catch (FlightRuntimeException fre) {
 // ARROW-17785: suppress exceptions caused by flaky gRPC layer
 if (fre.status().code().equals(FlightStatusCode.UNAVAILABLE) ||
 (fre.status().code().equals(FlightStatusCode.INTERNAL) &&
 fre.getMessage().contains("Connection closed after GOAWAY"))) {
 LOGGER.warn("Supressed error closing PreparedStatement", fre);
 return;
 }
 throw fre;
 }
 }
 };
 }
Expand Down

2 changes: 0 additions & 2 deletions
...c/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSourceTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,6 @@ public class ArrowFlightJdbcConnectionPoolDataSourceTest {
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
Expand Down

6 changes: 4 additions & 2 deletions
...sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,10 @@ public class ArrowFlightJdbcDriverTest {
 new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

6 changes: 4 additions & 2 deletions
...ql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,10 @@ public class ArrowFlightJdbcFactoryTest {
 new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

6 changes: 4 additions & 2 deletions
...ght/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,8 +56,10 @@ public class ConnectionTest {
 .user(userTest, passTest)
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

2 changes: 0 additions & 2 deletions
.../flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ public class ConnectionTlsTest {
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .useEncryption(certKey.cert, certKey.key)
 .producer(PRODUCER)
Expand Down

61 changes: 8 additions & 53 deletions
...ight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/FlightServerTestRule.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import me.alexpanov.net.FreePortFinder;

/**
 * Utility class for unit tests that need to instantiate a {@link FlightServer}
 * and interact with it.
Expand DownExpand Up@@ -95,8 +93,6 @@ public static FlightServerTestRule createStandardTestRule(final FlightSqlProduce
 .build();

 return new Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .producer(producer)
 .build();
Expand All@@ -106,11 +102,6 @@ ArrowFlightJdbcDataSource createDataSource() {
 return ArrowFlightJdbcDataSource.createNewDataSource(properties);
 }

 ArrowFlightJdbcDataSource createDataSource(String token) {
 properties.put("token", token);
 return ArrowFlightJdbcDataSource.createNewDataSource(properties);
 }

 public ArrowFlightJdbcConnectionPoolDataSource createConnectionPoolDataSource() {
 return ArrowFlightJdbcConnectionPoolDataSource.createNewDataSource(properties);
 }
Expand DownExpand Up@@ -159,9 +150,8 @@ public Statement apply(Statement base, Description description) {
 return new Statement() {
 @Override
 public void evaluate() throws Throwable {
 try (FlightServer flightServer =
 getStartServer(location ->
 initiateServer(location), 3)) {
 try (FlightServer flightServer = getStartServer(location -> initiateServer(location), 3)) {
 properties.put("port", flightServer.getPort());
 LOGGER.info("Started " + FlightServer.class.getName() + " as " + flightServer);
 base.evaluate();
 } finally {
Expand All@@ -174,12 +164,9 @@ public void evaluate() throws Throwable {
 private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newServerFromLocation,
 int retries)
 throws IOException {

 final Deque<ReflectiveOperationException> exceptions = new ArrayDeque<>();

 for (; retries > 0; retries--) {
 final Location location = Location.forGrpcInsecure(config.getHost(), config.getPort());
 final FlightServer server = newServerFromLocation.apply(location);
 final FlightServer server = newServerFromLocation.apply(Location.forGrpcInsecure("localhost", 0));
 try {
 Method start = server.getClass().getMethod("start");
 start.setAccessible(true);
Expand All@@ -189,9 +176,7 @@ private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newS
 exceptions.add(e);
 }
 }

 exceptions.forEach(
 e -> LOGGER.error("Failed to start a new " + FlightServer.class.getName() + ".", e));
 exceptions.forEach(e -> LOGGER.error("Failed to start FlightServer", e));
 throw new IOException(exceptions.pop().getCause());
 }

Expand DownExpand Up@@ -223,44 +208,14 @@ public void close() throws Exception {
 * Builder for {@link FlightServerTestRule}.
 */
 public static final class Builder {
 private final Properties properties = new Properties();
 private final Properties properties;
 private FlightSqlProducer producer;
 private Authentication authentication;
 private CertKeyPair certKeyPair;

 /**
 * Sets the host for the server rule.
 *
 * @param host the host value.
 * @return the Builder.
 */
 public Builder host(final String host) {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.HOST.camelName(),
 host);
 return this;
 }

 /**
 * Sets a random port to be used by the server rule.
 *
 * @return the Builder.
 */
 public Builder randomPort() {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
 FreePortFinder.findFreeLocalPort());
 return this;
 }

 /**
 * Sets a specific port to be used by the server rule.
 *
 * @param port the port value.
 * @return the Builder.
 */
 public Builder port(final int port) {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
 port);
 return this;
 public Builder() {
 this.properties = new Properties();
 this.properties.put("host", "localhost");
 }

 /**
Expand Down

1 change: 0 additions & 1 deletion
...ight/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ResultSetTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,6 @@ public void testShouldRunSelectQuerySettingLargeMaxRowLimit() throws Exception {
 try (Statement statement = connection.createStatement();
 ResultSet resultSet = statement.executeQuery(
 CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {

 final long maxRowsLimit = 3;
 statement.setLargeMaxRows(maxRowsLimit);

Expand Down

2 changes: 0 additions & 2 deletions
...t-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/TokenAuthenticationTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ public class TokenAuthenticationTest {

 static {
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(new TokenAuthentication.Builder()
 .token("1234")
 .build())
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests#14210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 1 commit into

from

Sep 23, 2022
 Merged


ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests
#14210
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 0 additions & 6 deletions
java/flight/flight-sql-jdbc-driver/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,12 +96,6 @@
 <version>1.3</version>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>me.alexpanov</groupId>
 <artifactId>free-port-finder</artifactId>
 <version>1.1.1</version>
 <scope>test</scope>
 </dependency>

 <dependency>
 <groupId>commons-io</groupId>
Expand Down

18 changes: 16 additions & 2 deletions
...driver/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
import org.apache.arrow.flight.FlightEndpoint;
import org.apache.arrow.flight.FlightInfo;
import org.apache.arrow.flight.FlightRuntimeException;
import org.apache.arrow.flight.FlightStatusCode;
import org.apache.arrow.flight.FlightStream;
import org.apache.arrow.flight.Location;
import org.apache.arrow.flight.auth2.BearerCredentialWriter;
Expand All@@ -49,12 +50,14 @@
import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.calcite.avatica.Meta.StatementType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
 * A {@link FlightSqlClient} handler.
 */
public final class ArrowFlightSqlClientHandler implements AutoCloseable {

 private static final Logger LOGGER = LoggerFactory.getLogger(ArrowFlightSqlClientHandler.class);
 private final FlightSqlClient sqlClient;
 private final Set<CallOption> options = new HashSet<>();

Expand DownExpand Up@@ -189,7 +192,18 @@ public Schema getDataSetSchema() {

 @Override
 public void close() {
 preparedStatement.close(getOptions());
 try {
 preparedStatement.close(getOptions());
 } catch (FlightRuntimeException fre) {
 // ARROW-17785: suppress exceptions caused by flaky gRPC layer
 if (fre.status().code().equals(FlightStatusCode.UNAVAILABLE) ||
 (fre.status().code().equals(FlightStatusCode.INTERNAL) &&
 fre.getMessage().contains("Connection closed after GOAWAY"))) {
 LOGGER.warn("Supressed error closing PreparedStatement", fre);
 return;
 }
 throw fre;
 }
 }
 };
 }
Expand Down

2 changes: 0 additions & 2 deletions
...c/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSourceTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,6 @@ public class ArrowFlightJdbcConnectionPoolDataSourceTest {
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
Expand Down

6 changes: 4 additions & 2 deletions
...sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,10 @@ public class ArrowFlightJdbcDriverTest {
 new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

6 changes: 4 additions & 2 deletions
...ql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,10 @@ public class ArrowFlightJdbcFactoryTest {
 new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

6 changes: 4 additions & 2 deletions
...ght/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,8 +56,10 @@ public class ConnectionTest {
 .user(userTest, passTest)
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

2 changes: 0 additions & 2 deletions
.../flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ public class ConnectionTlsTest {
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .useEncryption(certKey.cert, certKey.key)
 .producer(PRODUCER)
Expand Down

61 changes: 8 additions & 53 deletions
...ight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/FlightServerTestRule.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import me.alexpanov.net.FreePortFinder;

/**
 * Utility class for unit tests that need to instantiate a {@link FlightServer}
 * and interact with it.
Expand DownExpand Up@@ -95,8 +93,6 @@ public static FlightServerTestRule createStandardTestRule(final FlightSqlProduce
 .build();

 return new Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .producer(producer)
 .build();
Expand All@@ -106,11 +102,6 @@ ArrowFlightJdbcDataSource createDataSource() {
 return ArrowFlightJdbcDataSource.createNewDataSource(properties);
 }

 ArrowFlightJdbcDataSource createDataSource(String token) {
 properties.put("token", token);
 return ArrowFlightJdbcDataSource.createNewDataSource(properties);
 }

 public ArrowFlightJdbcConnectionPoolDataSource createConnectionPoolDataSource() {
 return ArrowFlightJdbcConnectionPoolDataSource.createNewDataSource(properties);
 }
Expand DownExpand Up@@ -159,9 +150,8 @@ public Statement apply(Statement base, Description description) {
 return new Statement() {
 @Override
 public void evaluate() throws Throwable {
 try (FlightServer flightServer =
 getStartServer(location ->
 initiateServer(location), 3)) {
 try (FlightServer flightServer = getStartServer(location -> initiateServer(location), 3)) {
 properties.put("port", flightServer.getPort());
 LOGGER.info("Started " + FlightServer.class.getName() + " as " + flightServer);
 base.evaluate();
 } finally {
Expand All@@ -174,12 +164,9 @@ public void evaluate() throws Throwable {
 private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newServerFromLocation,
 int retries)
 throws IOException {

 final Deque<ReflectiveOperationException> exceptions = new ArrayDeque<>();

 for (; retries > 0; retries--) {
 final Location location = Location.forGrpcInsecure(config.getHost(), config.getPort());
 final FlightServer server = newServerFromLocation.apply(location);
 final FlightServer server = newServerFromLocation.apply(Location.forGrpcInsecure("localhost", 0));
 try {
 Method start = server.getClass().getMethod("start");
 start.setAccessible(true);
Expand All@@ -189,9 +176,7 @@ private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newS
 exceptions.add(e);
 }
 }

 exceptions.forEach(
 e -> LOGGER.error("Failed to start a new " + FlightServer.class.getName() + ".", e));
 exceptions.forEach(e -> LOGGER.error("Failed to start FlightServer", e));
 throw new IOException(exceptions.pop().getCause());
 }

Expand DownExpand Up@@ -223,44 +208,14 @@ public void close() throws Exception {
 * Builder for {@link FlightServerTestRule}.
 */
 public static final class Builder {
 private final Properties properties = new Properties();
 private final Properties properties;
 private FlightSqlProducer producer;
 private Authentication authentication;
 private CertKeyPair certKeyPair;

 /**
 * Sets the host for the server rule.
 *
 * @param host the host value.
 * @return the Builder.
 */
 public Builder host(final String host) {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.HOST.camelName(),
 host);
 return this;
 }

 /**
 * Sets a random port to be used by the server rule.
 *
 * @return the Builder.
 */
 public Builder randomPort() {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
 FreePortFinder.findFreeLocalPort());
 return this;
 }

 /**
 * Sets a specific port to be used by the server rule.
 *
 * @param port the port value.
 * @return the Builder.
 */
 public Builder port(final int port) {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
 port);
 return this;
 public Builder() {
 this.properties = new Properties();
 this.properties.put("host", "localhost");
 }

 /**
Expand Down

1 change: 0 additions & 1 deletion
...ight/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ResultSetTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,6 @@ public void testShouldRunSelectQuerySettingLargeMaxRowLimit() throws Exception {
 try (Statement statement = connection.createStatement();
 ResultSet resultSet = statement.executeQuery(
 CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {

 final long maxRowsLimit = 3;
 statement.setLargeMaxRows(maxRowsLimit);

Expand Down

2 changes: 0 additions & 2 deletions
...t-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/TokenAuthenticationTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ public class TokenAuthenticationTest {

 static {
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(new TokenAuthentication.Builder()
 .token("1234")
 .build())
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests#14210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 1 commit into

from

Sep 23, 2022
 Merged


ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests
#14210
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 0 additions & 6 deletions
java/flight/flight-sql-jdbc-driver/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,12 +96,6 @@
 <version>1.3</version>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>me.alexpanov</groupId>
 <artifactId>free-port-finder</artifactId>
 <version>1.1.1</version>
 <scope>test</scope>
 </dependency>

 <dependency>
 <groupId>commons-io</groupId>
Expand Down

18 changes: 16 additions & 2 deletions
...driver/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
import org.apache.arrow.flight.FlightEndpoint;
import org.apache.arrow.flight.FlightInfo;
import org.apache.arrow.flight.FlightRuntimeException;
import org.apache.arrow.flight.FlightStatusCode;
import org.apache.arrow.flight.FlightStream;
import org.apache.arrow.flight.Location;
import org.apache.arrow.flight.auth2.BearerCredentialWriter;
Expand All@@ -49,12 +50,14 @@
import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.calcite.avatica.Meta.StatementType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
 * A {@link FlightSqlClient} handler.
 */
public final class ArrowFlightSqlClientHandler implements AutoCloseable {

 private static final Logger LOGGER = LoggerFactory.getLogger(ArrowFlightSqlClientHandler.class);
 private final FlightSqlClient sqlClient;
 private final Set<CallOption> options = new HashSet<>();

Expand DownExpand Up@@ -189,7 +192,18 @@ public Schema getDataSetSchema() {

 @Override
 public void close() {
 preparedStatement.close(getOptions());
 try {
 preparedStatement.close(getOptions());
 } catch (FlightRuntimeException fre) {
 // ARROW-17785: suppress exceptions caused by flaky gRPC layer
 if (fre.status().code().equals(FlightStatusCode.UNAVAILABLE) ||
 (fre.status().code().equals(FlightStatusCode.INTERNAL) &&
 fre.getMessage().contains("Connection closed after GOAWAY"))) {
 LOGGER.warn("Supressed error closing PreparedStatement", fre);
 return;
 }
 throw fre;
 }
 }
 };
 }
Expand Down

2 changes: 0 additions & 2 deletions
...c/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSourceTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,6 @@ public class ArrowFlightJdbcConnectionPoolDataSourceTest {
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
Expand Down

6 changes: 4 additions & 2 deletions
...sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,10 @@ public class ArrowFlightJdbcDriverTest {
 new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

6 changes: 4 additions & 2 deletions
...ql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,10 @@ public class ArrowFlightJdbcFactoryTest {
 new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

6 changes: 4 additions & 2 deletions
...ght/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,8 +56,10 @@ public class ConnectionTest {
 .user(userTest, passTest)
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

2 changes: 0 additions & 2 deletions
.../flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ public class ConnectionTlsTest {
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .useEncryption(certKey.cert, certKey.key)
 .producer(PRODUCER)
Expand Down

61 changes: 8 additions & 53 deletions
...ight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/FlightServerTestRule.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import me.alexpanov.net.FreePortFinder;

/**
 * Utility class for unit tests that need to instantiate a {@link FlightServer}
 * and interact with it.
Expand DownExpand Up@@ -95,8 +93,6 @@ public static FlightServerTestRule createStandardTestRule(final FlightSqlProduce
 .build();

 return new Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .producer(producer)
 .build();
Expand All@@ -106,11 +102,6 @@ ArrowFlightJdbcDataSource createDataSource() {
 return ArrowFlightJdbcDataSource.createNewDataSource(properties);
 }

 ArrowFlightJdbcDataSource createDataSource(String token) {
 properties.put("token", token);
 return ArrowFlightJdbcDataSource.createNewDataSource(properties);
 }

 public ArrowFlightJdbcConnectionPoolDataSource createConnectionPoolDataSource() {
 return ArrowFlightJdbcConnectionPoolDataSource.createNewDataSource(properties);
 }
Expand DownExpand Up@@ -159,9 +150,8 @@ public Statement apply(Statement base, Description description) {
 return new Statement() {
 @Override
 public void evaluate() throws Throwable {
 try (FlightServer flightServer =
 getStartServer(location ->
 initiateServer(location), 3)) {
 try (FlightServer flightServer = getStartServer(location -> initiateServer(location), 3)) {
 properties.put("port", flightServer.getPort());
 LOGGER.info("Started " + FlightServer.class.getName() + " as " + flightServer);
 base.evaluate();
 } finally {
Expand All@@ -174,12 +164,9 @@ public void evaluate() throws Throwable {
 private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newServerFromLocation,
 int retries)
 throws IOException {

 final Deque<ReflectiveOperationException> exceptions = new ArrayDeque<>();

 for (; retries > 0; retries--) {
 final Location location = Location.forGrpcInsecure(config.getHost(), config.getPort());
 final FlightServer server = newServerFromLocation.apply(location);
 final FlightServer server = newServerFromLocation.apply(Location.forGrpcInsecure("localhost", 0));
 try {
 Method start = server.getClass().getMethod("start");
 start.setAccessible(true);
Expand All@@ -189,9 +176,7 @@ private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newS
 exceptions.add(e);
 }
 }

 exceptions.forEach(
 e -> LOGGER.error("Failed to start a new " + FlightServer.class.getName() + ".", e));
 exceptions.forEach(e -> LOGGER.error("Failed to start FlightServer", e));
 throw new IOException(exceptions.pop().getCause());
 }

Expand DownExpand Up@@ -223,44 +208,14 @@ public void close() throws Exception {
 * Builder for {@link FlightServerTestRule}.
 */
 public static final class Builder {
 private final Properties properties = new Properties();
 private final Properties properties;
 private FlightSqlProducer producer;
 private Authentication authentication;
 private CertKeyPair certKeyPair;

 /**
 * Sets the host for the server rule.
 *
 * @param host the host value.
 * @return the Builder.
 */
 public Builder host(final String host) {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.HOST.camelName(),
 host);
 return this;
 }

 /**
 * Sets a random port to be used by the server rule.
 *
 * @return the Builder.
 */
 public Builder randomPort() {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
 FreePortFinder.findFreeLocalPort());
 return this;
 }

 /**
 * Sets a specific port to be used by the server rule.
 *
 * @param port the port value.
 * @return the Builder.
 */
 public Builder port(final int port) {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
 port);
 return this;
 public Builder() {
 this.properties = new Properties();
 this.properties.put("host", "localhost");
 }

 /**
Expand Down

1 change: 0 additions & 1 deletion
...ight/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ResultSetTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,6 @@ public void testShouldRunSelectQuerySettingLargeMaxRowLimit() throws Exception {
 try (Statement statement = connection.createStatement();
 ResultSet resultSet = statement.executeQuery(
 CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {

 final long maxRowsLimit = 3;
 statement.setLargeMaxRows(maxRowsLimit);

Expand Down

2 changes: 0 additions & 2 deletions
...t-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/TokenAuthenticationTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ public class TokenAuthenticationTest {

 static {
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(new TokenAuthentication.Builder()
 .token("1234")
 .build())
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests#14210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 1 commit into

from

Sep 23, 2022
 Merged


ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests
#14210
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 0 additions & 6 deletions
java/flight/flight-sql-jdbc-driver/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,12 +96,6 @@
 <version>1.3</version>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>me.alexpanov</groupId>
 <artifactId>free-port-finder</artifactId>
 <version>1.1.1</version>
 <scope>test</scope>
 </dependency>

 <dependency>
 <groupId>commons-io</groupId>
Expand Down

18 changes: 16 additions & 2 deletions
...driver/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
import org.apache.arrow.flight.FlightEndpoint;
import org.apache.arrow.flight.FlightInfo;
import org.apache.arrow.flight.FlightRuntimeException;
import org.apache.arrow.flight.FlightStatusCode;
import org.apache.arrow.flight.FlightStream;
import org.apache.arrow.flight.Location;
import org.apache.arrow.flight.auth2.BearerCredentialWriter;
Expand All@@ -49,12 +50,14 @@
import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.calcite.avatica.Meta.StatementType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
 * A {@link FlightSqlClient} handler.
 */
public final class ArrowFlightSqlClientHandler implements AutoCloseable {

 private static final Logger LOGGER = LoggerFactory.getLogger(ArrowFlightSqlClientHandler.class);
 private final FlightSqlClient sqlClient;
 private final Set<CallOption> options = new HashSet<>();

Expand DownExpand Up@@ -189,7 +192,18 @@ public Schema getDataSetSchema() {

 @Override
 public void close() {
 preparedStatement.close(getOptions());
 try {
 preparedStatement.close(getOptions());
 } catch (FlightRuntimeException fre) {
 // ARROW-17785: suppress exceptions caused by flaky gRPC layer
 if (fre.status().code().equals(FlightStatusCode.UNAVAILABLE) ||
 (fre.status().code().equals(FlightStatusCode.INTERNAL) &&
 fre.getMessage().contains("Connection closed after GOAWAY"))) {
 LOGGER.warn("Supressed error closing PreparedStatement", fre);
 return;
 }
 throw fre;
 }
 }
 };
 }
Expand Down

2 changes: 0 additions & 2 deletions
...c/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSourceTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,6 @@ public class ArrowFlightJdbcConnectionPoolDataSourceTest {
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
Expand Down

6 changes: 4 additions & 2 deletions
...sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,10 @@ public class ArrowFlightJdbcDriverTest {
 new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

6 changes: 4 additions & 2 deletions
...ql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,10 @@ public class ArrowFlightJdbcFactoryTest {
 new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

6 changes: 4 additions & 2 deletions
...ght/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,8 +56,10 @@ public class ConnectionTest {
 .user(userTest, passTest)
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

2 changes: 0 additions & 2 deletions
.../flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ public class ConnectionTlsTest {
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .useEncryption(certKey.cert, certKey.key)
 .producer(PRODUCER)
Expand Down

61 changes: 8 additions & 53 deletions
...ight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/FlightServerTestRule.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import me.alexpanov.net.FreePortFinder;

/**
 * Utility class for unit tests that need to instantiate a {@link FlightServer}
 * and interact with it.
Expand DownExpand Up@@ -95,8 +93,6 @@ public static FlightServerTestRule createStandardTestRule(final FlightSqlProduce
 .build();

 return new Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .producer(producer)
 .build();
Expand All@@ -106,11 +102,6 @@ ArrowFlightJdbcDataSource createDataSource() {
 return ArrowFlightJdbcDataSource.createNewDataSource(properties);
 }

 ArrowFlightJdbcDataSource createDataSource(String token) {
 properties.put("token", token);
 return ArrowFlightJdbcDataSource.createNewDataSource(properties);
 }

 public ArrowFlightJdbcConnectionPoolDataSource createConnectionPoolDataSource() {
 return ArrowFlightJdbcConnectionPoolDataSource.createNewDataSource(properties);
 }
Expand DownExpand Up@@ -159,9 +150,8 @@ public Statement apply(Statement base, Description description) {
 return new Statement() {
 @Override
 public void evaluate() throws Throwable {
 try (FlightServer flightServer =
 getStartServer(location ->
 initiateServer(location), 3)) {
 try (FlightServer flightServer = getStartServer(location -> initiateServer(location), 3)) {
 properties.put("port", flightServer.getPort());
 LOGGER.info("Started " + FlightServer.class.getName() + " as " + flightServer);
 base.evaluate();
 } finally {
Expand All@@ -174,12 +164,9 @@ public void evaluate() throws Throwable {
 private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newServerFromLocation,
 int retries)
 throws IOException {

 final Deque<ReflectiveOperationException> exceptions = new ArrayDeque<>();

 for (; retries > 0; retries--) {
 final Location location = Location.forGrpcInsecure(config.getHost(), config.getPort());
 final FlightServer server = newServerFromLocation.apply(location);
 final FlightServer server = newServerFromLocation.apply(Location.forGrpcInsecure("localhost", 0));
 try {
 Method start = server.getClass().getMethod("start");
 start.setAccessible(true);
Expand All@@ -189,9 +176,7 @@ private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newS
 exceptions.add(e);
 }
 }

 exceptions.forEach(
 e -> LOGGER.error("Failed to start a new " + FlightServer.class.getName() + ".", e));
 exceptions.forEach(e -> LOGGER.error("Failed to start FlightServer", e));
 throw new IOException(exceptions.pop().getCause());
 }

Expand DownExpand Up@@ -223,44 +208,14 @@ public void close() throws Exception {
 * Builder for {@link FlightServerTestRule}.
 */
 public static final class Builder {
 private final Properties properties = new Properties();
 private final Properties properties;
 private FlightSqlProducer producer;
 private Authentication authentication;
 private CertKeyPair certKeyPair;

 /**
 * Sets the host for the server rule.
 *
 * @param host the host value.
 * @return the Builder.
 */
 public Builder host(final String host) {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.HOST.camelName(),
 host);
 return this;
 }

 /**
 * Sets a random port to be used by the server rule.
 *
 * @return the Builder.
 */
 public Builder randomPort() {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
 FreePortFinder.findFreeLocalPort());
 return this;
 }

 /**
 * Sets a specific port to be used by the server rule.
 *
 * @param port the port value.
 * @return the Builder.
 */
 public Builder port(final int port) {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
 port);
 return this;
 public Builder() {
 this.properties = new Properties();
 this.properties.put("host", "localhost");
 }

 /**
Expand Down

1 change: 0 additions & 1 deletion
...ight/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ResultSetTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,6 @@ public void testShouldRunSelectQuerySettingLargeMaxRowLimit() throws Exception {
 try (Statement statement = connection.createStatement();
 ResultSet resultSet = statement.executeQuery(
 CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {

 final long maxRowsLimit = 3;
 statement.setLargeMaxRows(maxRowsLimit);

Expand Down

2 changes: 0 additions & 2 deletions
...t-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/TokenAuthenticationTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ public class TokenAuthenticationTest {

 static {
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(new TokenAuthentication.Builder()
 .token("1234")
 .build())
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests#14210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 1 commit into

from

Sep 23, 2022
 Merged


ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests
#14210
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 0 additions & 6 deletions
java/flight/flight-sql-jdbc-driver/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,12 +96,6 @@
 <version>1.3</version>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>me.alexpanov</groupId>
 <artifactId>free-port-finder</artifactId>
 <version>1.1.1</version>
 <scope>test</scope>
 </dependency>

 <dependency>
 <groupId>commons-io</groupId>
Expand Down

18 changes: 16 additions & 2 deletions
...driver/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
import org.apache.arrow.flight.FlightEndpoint;
import org.apache.arrow.flight.FlightInfo;
import org.apache.arrow.flight.FlightRuntimeException;
import org.apache.arrow.flight.FlightStatusCode;
import org.apache.arrow.flight.FlightStream;
import org.apache.arrow.flight.Location;
import org.apache.arrow.flight.auth2.BearerCredentialWriter;
Expand All@@ -49,12 +50,14 @@
import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.calcite.avatica.Meta.StatementType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
 * A {@link FlightSqlClient} handler.
 */
public final class ArrowFlightSqlClientHandler implements AutoCloseable {

 private static final Logger LOGGER = LoggerFactory.getLogger(ArrowFlightSqlClientHandler.class);
 private final FlightSqlClient sqlClient;
 private final Set<CallOption> options = new HashSet<>();

Expand DownExpand Up@@ -189,7 +192,18 @@ public Schema getDataSetSchema() {

 @Override
 public void close() {
 preparedStatement.close(getOptions());
 try {
 preparedStatement.close(getOptions());
 } catch (FlightRuntimeException fre) {
 // ARROW-17785: suppress exceptions caused by flaky gRPC layer
 if (fre.status().code().equals(FlightStatusCode.UNAVAILABLE) ||
 (fre.status().code().equals(FlightStatusCode.INTERNAL) &&
 fre.getMessage().contains("Connection closed after GOAWAY"))) {
 LOGGER.warn("Supressed error closing PreparedStatement", fre);
 return;
 }
 throw fre;
 }
 }
 };
 }
Expand Down

2 changes: 0 additions & 2 deletions
...c/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSourceTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,6 @@ public class ArrowFlightJdbcConnectionPoolDataSourceTest {
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
Expand Down

6 changes: 4 additions & 2 deletions
...sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,10 @@ public class ArrowFlightJdbcDriverTest {
 new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

6 changes: 4 additions & 2 deletions
...ql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,10 @@ public class ArrowFlightJdbcFactoryTest {
 new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

6 changes: 4 additions & 2 deletions
...ght/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,8 +56,10 @@ public class ConnectionTest {
 .user(userTest, passTest)
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

2 changes: 0 additions & 2 deletions
.../flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ public class ConnectionTlsTest {
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .useEncryption(certKey.cert, certKey.key)
 .producer(PRODUCER)
Expand Down

61 changes: 8 additions & 53 deletions
...ight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/FlightServerTestRule.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import me.alexpanov.net.FreePortFinder;

/**
 * Utility class for unit tests that need to instantiate a {@link FlightServer}
 * and interact with it.
Expand DownExpand Up@@ -95,8 +93,6 @@ public static FlightServerTestRule createStandardTestRule(final FlightSqlProduce
 .build();

 return new Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .producer(producer)
 .build();
Expand All@@ -106,11 +102,6 @@ ArrowFlightJdbcDataSource createDataSource() {
 return ArrowFlightJdbcDataSource.createNewDataSource(properties);
 }

 ArrowFlightJdbcDataSource createDataSource(String token) {
 properties.put("token", token);
 return ArrowFlightJdbcDataSource.createNewDataSource(properties);
 }

 public ArrowFlightJdbcConnectionPoolDataSource createConnectionPoolDataSource() {
 return ArrowFlightJdbcConnectionPoolDataSource.createNewDataSource(properties);
 }
Expand DownExpand Up@@ -159,9 +150,8 @@ public Statement apply(Statement base, Description description) {
 return new Statement() {
 @Override
 public void evaluate() throws Throwable {
 try (FlightServer flightServer =
 getStartServer(location ->
 initiateServer(location), 3)) {
 try (FlightServer flightServer = getStartServer(location -> initiateServer(location), 3)) {
 properties.put("port", flightServer.getPort());
 LOGGER.info("Started " + FlightServer.class.getName() + " as " + flightServer);
 base.evaluate();
 } finally {
Expand All@@ -174,12 +164,9 @@ public void evaluate() throws Throwable {
 private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newServerFromLocation,
 int retries)
 throws IOException {

 final Deque<ReflectiveOperationException> exceptions = new ArrayDeque<>();

 for (; retries > 0; retries--) {
 final Location location = Location.forGrpcInsecure(config.getHost(), config.getPort());
 final FlightServer server = newServerFromLocation.apply(location);
 final FlightServer server = newServerFromLocation.apply(Location.forGrpcInsecure("localhost", 0));
 try {
 Method start = server.getClass().getMethod("start");
 start.setAccessible(true);
Expand All@@ -189,9 +176,7 @@ private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newS
 exceptions.add(e);
 }
 }

 exceptions.forEach(
 e -> LOGGER.error("Failed to start a new " + FlightServer.class.getName() + ".", e));
 exceptions.forEach(e -> LOGGER.error("Failed to start FlightServer", e));
 throw new IOException(exceptions.pop().getCause());
 }

Expand DownExpand Up@@ -223,44 +208,14 @@ public void close() throws Exception {
 * Builder for {@link FlightServerTestRule}.
 */
 public static final class Builder {
 private final Properties properties = new Properties();
 private final Properties properties;
 private FlightSqlProducer producer;
 private Authentication authentication;
 private CertKeyPair certKeyPair;

 /**
 * Sets the host for the server rule.
 *
 * @param host the host value.
 * @return the Builder.
 */
 public Builder host(final String host) {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.HOST.camelName(),
 host);
 return this;
 }

 /**
 * Sets a random port to be used by the server rule.
 *
 * @return the Builder.
 */
 public Builder randomPort() {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
 FreePortFinder.findFreeLocalPort());
 return this;
 }

 /**
 * Sets a specific port to be used by the server rule.
 *
 * @param port the port value.
 * @return the Builder.
 */
 public Builder port(final int port) {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
 port);
 return this;
 public Builder() {
 this.properties = new Properties();
 this.properties.put("host", "localhost");
 }

 /**
Expand Down

1 change: 0 additions & 1 deletion
...ight/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ResultSetTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,6 @@ public void testShouldRunSelectQuerySettingLargeMaxRowLimit() throws Exception {
 try (Statement statement = connection.createStatement();
 ResultSet resultSet = statement.executeQuery(
 CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {

 final long maxRowsLimit = 3;
 statement.setLargeMaxRows(maxRowsLimit);

Expand Down

2 changes: 0 additions & 2 deletions
...t-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/TokenAuthenticationTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ public class TokenAuthenticationTest {

 static {
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(new TokenAuthentication.Builder()
 .token("1234")
 .build())
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests#14210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lidavidm
merged 1 commit into

from

Sep 23, 2022
 Merged


ARROW-17785: [Java] Suppress flakiness from gRPC in JDBC driver tests
#14210
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 0 additions & 6 deletions
java/flight/flight-sql-jdbc-driver/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -96,12 +96,6 @@
 <version>1.3</version>
 <scope>test</scope>
 </dependency>
 <dependency>
 <groupId>me.alexpanov</groupId>
 <artifactId>free-port-finder</artifactId>
 <version>1.1.1</version>
 <scope>test</scope>
 </dependency>

 <dependency>
 <groupId>commons-io</groupId>
Expand Down

18 changes: 16 additions & 2 deletions
...driver/src/main/java/org/apache/arrow/driver/jdbc/client/ArrowFlightSqlClientHandler.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,7 @@
import org.apache.arrow.flight.FlightEndpoint;
import org.apache.arrow.flight.FlightInfo;
import org.apache.arrow.flight.FlightRuntimeException;
import org.apache.arrow.flight.FlightStatusCode;
import org.apache.arrow.flight.FlightStream;
import org.apache.arrow.flight.Location;
import org.apache.arrow.flight.auth2.BearerCredentialWriter;
Expand All@@ -49,12 +50,14 @@
import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.calcite.avatica.Meta.StatementType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
 * A {@link FlightSqlClient} handler.
 */
public final class ArrowFlightSqlClientHandler implements AutoCloseable {

 private static final Logger LOGGER = LoggerFactory.getLogger(ArrowFlightSqlClientHandler.class);
 private final FlightSqlClient sqlClient;
 private final Set<CallOption> options = new HashSet<>();

Expand DownExpand Up@@ -189,7 +192,18 @@ public Schema getDataSetSchema() {

 @Override
 public void close() {
 preparedStatement.close(getOptions());
 try {
 preparedStatement.close(getOptions());
 } catch (FlightRuntimeException fre) {
 // ARROW-17785: suppress exceptions caused by flaky gRPC layer
 if (fre.status().code().equals(FlightStatusCode.UNAVAILABLE) ||
 (fre.status().code().equals(FlightStatusCode.INTERNAL) &&
 fre.getMessage().contains("Connection closed after GOAWAY"))) {
 LOGGER.warn("Supressed error closing PreparedStatement", fre);
 return;
 }
 throw fre;
 }
 }
 };
 }
Expand Down

2 changes: 0 additions & 2 deletions
...c/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcConnectionPoolDataSourceTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,8 +44,6 @@ public class ArrowFlightJdbcConnectionPoolDataSourceTest {
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
Expand Down

6 changes: 4 additions & 2 deletions
...sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcDriverTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,8 +54,10 @@ public class ArrowFlightJdbcDriverTest {
 new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

6 changes: 4 additions & 2 deletions
...ql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcFactoryTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,8 +49,10 @@ public class ArrowFlightJdbcFactoryTest {
 new UserPasswordAuthentication.Builder().user("user1", "pass1").user("user2", "pass2")
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

6 changes: 4 additions & 2 deletions
...ght/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -56,8 +56,10 @@ public class ConnectionTest {
 .user(userTest, passTest)
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder().host("localhost").randomPort()
 .authentication(authentication).producer(PRODUCER).build();
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .authentication(authentication)
 .producer(PRODUCER)
 .build();
 }

 private BufferAllocator allocator;
Expand Down

2 changes: 0 additions & 2 deletions
.../flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -63,8 +63,6 @@ public class ConnectionTlsTest {
 .build();

 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .useEncryption(certKey.cert, certKey.key)
 .producer(PRODUCER)
Expand Down

61 changes: 8 additions & 53 deletions
...ight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/FlightServerTestRule.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,8 +50,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import me.alexpanov.net.FreePortFinder;

/**
 * Utility class for unit tests that need to instantiate a {@link FlightServer}
 * and interact with it.
Expand DownExpand Up@@ -95,8 +93,6 @@ public static FlightServerTestRule createStandardTestRule(final FlightSqlProduce
 .build();

 return new Builder()
 .host("localhost")
 .randomPort()
 .authentication(authentication)
 .producer(producer)
 .build();
Expand All@@ -106,11 +102,6 @@ ArrowFlightJdbcDataSource createDataSource() {
 return ArrowFlightJdbcDataSource.createNewDataSource(properties);
 }

 ArrowFlightJdbcDataSource createDataSource(String token) {
 properties.put("token", token);
 return ArrowFlightJdbcDataSource.createNewDataSource(properties);
 }

 public ArrowFlightJdbcConnectionPoolDataSource createConnectionPoolDataSource() {
 return ArrowFlightJdbcConnectionPoolDataSource.createNewDataSource(properties);
 }
Expand DownExpand Up@@ -159,9 +150,8 @@ public Statement apply(Statement base, Description description) {
 return new Statement() {
 @Override
 public void evaluate() throws Throwable {
 try (FlightServer flightServer =
 getStartServer(location ->
 initiateServer(location), 3)) {
 try (FlightServer flightServer = getStartServer(location -> initiateServer(location), 3)) {
 properties.put("port", flightServer.getPort());
 LOGGER.info("Started " + FlightServer.class.getName() + " as " + flightServer);
 base.evaluate();
 } finally {
Expand All@@ -174,12 +164,9 @@ public void evaluate() throws Throwable {
 private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newServerFromLocation,
 int retries)
 throws IOException {

 final Deque<ReflectiveOperationException> exceptions = new ArrayDeque<>();

 for (; retries > 0; retries--) {
 final Location location = Location.forGrpcInsecure(config.getHost(), config.getPort());
 final FlightServer server = newServerFromLocation.apply(location);
 final FlightServer server = newServerFromLocation.apply(Location.forGrpcInsecure("localhost", 0));
 try {
 Method start = server.getClass().getMethod("start");
 start.setAccessible(true);
Expand All@@ -189,9 +176,7 @@ private FlightServer getStartServer(CheckedFunction<Location, FlightServer> newS
 exceptions.add(e);
 }
 }

 exceptions.forEach(
 e -> LOGGER.error("Failed to start a new " + FlightServer.class.getName() + ".", e));
 exceptions.forEach(e -> LOGGER.error("Failed to start FlightServer", e));
 throw new IOException(exceptions.pop().getCause());
 }

Expand DownExpand Up@@ -223,44 +208,14 @@ public void close() throws Exception {
 * Builder for {@link FlightServerTestRule}.
 */
 public static final class Builder {
 private final Properties properties = new Properties();
 private final Properties properties;
 private FlightSqlProducer producer;
 private Authentication authentication;
 private CertKeyPair certKeyPair;

 /**
 * Sets the host for the server rule.
 *
 * @param host the host value.
 * @return the Builder.
 */
 public Builder host(final String host) {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.HOST.camelName(),
 host);
 return this;
 }

 /**
 * Sets a random port to be used by the server rule.
 *
 * @return the Builder.
 */
 public Builder randomPort() {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
 FreePortFinder.findFreeLocalPort());
 return this;
 }

 /**
 * Sets a specific port to be used by the server rule.
 *
 * @param port the port value.
 * @return the Builder.
 */
 public Builder port(final int port) {
 properties.put(ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty.PORT.camelName(),
 port);
 return this;
 public Builder() {
 this.properties = new Properties();
 this.properties.put("host", "localhost");
 }

 /**
Expand Down

1 change: 0 additions & 1 deletion
...ight/flight-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/ResultSetTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -160,7 +160,6 @@ public void testShouldRunSelectQuerySettingLargeMaxRowLimit() throws Exception {
 try (Statement statement = connection.createStatement();
 ResultSet resultSet = statement.executeQuery(
 CoreMockedSqlProducers.LEGACY_REGULAR_SQL_CMD)) {

 final long maxRowsLimit = 3;
 statement.setLargeMaxRows(maxRowsLimit);

Expand Down

2 changes: 0 additions & 2 deletions
...t-sql-jdbc-driver/src/test/java/org/apache/arrow/driver/jdbc/TokenAuthenticationTest.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,8 +36,6 @@ public class TokenAuthenticationTest {

 static {
 FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
 .host("localhost")
 .randomPort()
 .authentication(new TokenAuthentication.Builder()
 .token("1234")
 .build())
Expand Down