Skip to content

[ZEPPELIN-6481] Restore interrupt status after InterruptedException in JDBC completion loading #5288

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
jongyoul merged 1 commit into from
Jul 12, 2026
+32 −0
Merged

[ZEPPELIN-6481] Restore interrupt status after InterruptedException in JDBC completion loading #5288

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
1 change: 1 addition & 0 deletions jdbc/src/main/java/org/apache/zeppelin/jdbc/JDBCInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ public void run() {
LOGGER.warn("Error close connection", e1);
}
}
Thread.currentThread().interrupt();
}
return completer;
}
Expand Down
31 changes: 31 additions & 0 deletions jdbc/src/test/java/org/apache/zeppelin/jdbc/JDBCInterpreterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.junit.jupiter.api.Test;

import java.io.IOException;
import java.lang.reflect.Method;
import java.nio.file.Files;
import java.nio.file.Path;
import java.sql.Connection;
Expand All @@ -52,6 +53,7 @@
import static java.lang.String.format;
import static org.apache.zeppelin.jdbc.JDBCInterpreter.COMMON_MAX_LINE;
import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_DRIVER;
import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_KEY;
import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_PASSWORD;
import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_PRECODE;
import static org.apache.zeppelin.jdbc.JDBCInterpreter.DEFAULT_STATEMENT_PRECODE;
Expand Down Expand Up @@ -510,6 +512,35 @@ void testAutoCompletion() throws IOException, InterpreterException {
assertEquals(true, completionList.contains(correctCompletionKeyword));
}

@Test
void testCreateOrUpdateSqlCompleterRestoresInterruptStatusOnTimeout() throws Exception {
Properties properties = new Properties();
properties.setProperty("common.max_count", "1000");
properties.setProperty("common.max_retry", "3");
properties.setProperty("default.driver", "org.h2.Driver");
properties.setProperty("default.url", getJdbcConnection());
properties.setProperty("default.user", "");
properties.setProperty("default.password", "");
JDBCInterpreter jdbcInterpreter = new JDBCInterpreter(properties);

// createOrUpdateSqlCompleter is private, so invoke it via reflection.
Method createOrUpdateSqlCompleter = JDBCInterpreter.class.getDeclaredMethod(
"createOrUpdateSqlCompleter", SqlCompleter.class, Connection.class, String.class,
String.class, int.class);
createOrUpdateSqlCompleter.setAccessible(true);

// Entering already interrupted makes awaitTermination throw InterruptedException
// immediately, deterministically hitting the catch block under test.
Thread.currentThread().interrupt();
try {
createOrUpdateSqlCompleter.invoke(jdbcInterpreter, null, null, DEFAULT_KEY, "sel", 3);
assertTrue(Thread.currentThread().isInterrupted());
} finally {
// Clear the interrupt flag so it doesn't leak into subsequent tests.
Thread.interrupted();
}
}

private Properties getDBProperty(String dbPrefix,
String dbUser,
String dbPassowrd) throws IOException {
Expand Down
Loading