Skip to content

Commit 65119ba

Browse files
pessepesse
committed
Simple solution to deal with OracleStatementTimeoutException
Fixes #20
1 parent 079e021 commit 65119ba

File tree

5 files changed

+182
-35
lines changed

5 files changed

+182
-35
lines changed

‎pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,18 @@
5353
<artifactId>logback-classic</artifactId>
5454
<version>1.2.3</version>
5555
</dependency>
56+
<dependency>
57+
<groupId>com.oracle.jdbc</groupId>
58+
<artifactId>ojdbc8</artifactId>
59+
<version>12.2.0.1</version>
60+
<scope>compile</scope>
61+
</dependency>
62+
<dependency>
63+
<groupId>com.oracle.jdbc</groupId>
64+
<artifactId>orai18n</artifactId>
65+
<version>12.2.0.1</version>
66+
<scope>compile</scope>
67+
</dependency>
5668

5769
<!-- Test -->
5870
<dependency>

‎src/main/java/org/utplsql/cli/ReporterManager.java‎

Lines changed: 31 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
class ReporterManager {
2020

2121
private List<ReporterOptions> reporterOptionsList;
22+
private List<Throwable> reporterGatherErrors;
23+
private ExecutorService executorService;
2224

2325
ReporterManager(List<String> reporterParams ) {
2426
initReporterOptionsList(reporterParams);
@@ -49,14 +51,33 @@ private void initReporterOptionsList( List<String> reporterParams ) {
4951
}
5052
}
5153

54+
private void abortGathering(Throwable e) {
55+
addGatherError(e);
56+
executorService.shutdownNow();
57+
}
58+
59+
private void addGatherError( Throwable e ) {
60+
if ( reporterGatherErrors == null ) {
61+
reporterGatherErrors = new ArrayList<>();
62+
}
63+
reporterGatherErrors.add(e);
64+
}
65+
66+
boolean haveGatherErrorsOccured() {
67+
return reporterGatherErrors != null && !reporterGatherErrors.isEmpty();
68+
}
69+
70+
List<Throwable> getGatherErrors() {
71+
return reporterGatherErrors;
72+
}
5273

5374
/** Initializes the reporters so we can use the id to gather results
5475
*
5576
* @param conn Active Connection
5677
* @return List of Reporters
5778
* @throws SQLException
5879
*/
59-
public List<Reporter> initReporters(Connection conn, ReporterFactory reporterFactory, CompatibilityProxy compatibilityProxy) throws SQLException
80+
List<Reporter> initReporters(Connection conn, ReporterFactory reporterFactory, CompatibilityProxy compatibilityProxy) throws SQLException
6081
{
6182
final List<Reporter> reporterList = new ArrayList<>();
6283

@@ -79,10 +100,14 @@ public List<Reporter> initReporters(Connection conn, ReporterFactory reporterFac
79100
*
80101
* @param executorService
81102
* @param dataSource
82-
* @param returnCode
83103
*/
84-
public void startReporterGatherers(ExecutorService executorService, final DataSource dataSource, final int[] returnCode)
104+
void startReporterGatherers(ExecutorService executorService, final DataSource dataSource)
85105
{
106+
if ( this.executorService != null && !this.executorService.isShutdown())
107+
throw new IllegalStateException("There is already a running executor service!");
108+
109+
this.executorService = executorService;
110+
86111
// TODO: Implement Init-check
87112
// Gather each reporter results on a separate thread.
88113
for (ReporterOptions ro : reporterOptionsList) {
@@ -103,9 +128,7 @@ public void startReporterGatherers(ExecutorService executorService, final DataSo
103128

104129
ro.getReporterObj().getOutputBuffer().printAvailable(conn, printStreams);
105130
} catch (SQLException | FileNotFoundException e) {
106-
System.out.println(e.getMessage());
107-
returnCode[0] = Cli.DEFAULT_ERROR_CODE;
108-
executorService.shutdownNow();
131+
abortGathering(e);
109132
} finally {
110133
if (fileOutStream != null)
111134
fileOutStream.close();
@@ -114,9 +137,9 @@ public void startReporterGatherers(ExecutorService executorService, final DataSo
114137
}
115138
}
116139

117-
public List<ReporterOptions> getReporterOptionsList() {
140+
List<ReporterOptions> getReporterOptionsList() {
118141
return reporterOptionsList;
119142
}
120143

121-
public int getNumberOfReporters() { return reporterOptionsList.size(); }
144+
int getNumberOfReporters() { return reporterOptionsList.size(); }
122145
}

‎src/main/java/org/utplsql/cli/RunCommand.java‎

Lines changed: 69 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
import com.beust.jcommander.Parameter;
44
import com.beust.jcommander.Parameters;
5+
import com.zaxxer.hikari.HikariDataSource;
6+
import com.zaxxer.hikari.pool.HikariProxyConnection;
57
import org.slf4j.Logger;
68
import org.slf4j.LoggerFactory;
79
import org.utplsql.api.*;
810
import org.utplsql.api.compatibility.CompatibilityProxy;
911
import org.utplsql.api.db.DefaultDatabaseInformation;
1012
import org.utplsql.api.exception.DatabaseNotCompatibleException;
13+
import org.utplsql.api.exception.OracleCreateStatmenetStuckException;
1114
import org.utplsql.api.exception.SomeTestsFailedException;
1215
import org.utplsql.api.exception.UtPLSQLNotInstalledException;
1316
import org.utplsql.api.reporter.Reporter;
@@ -25,6 +28,7 @@
2528
import java.util.List;
2629
import java.util.concurrent.ExecutorService;
2730
import java.util.concurrent.Executors;
31+
import java.util.concurrent.Future;
2832
import java.util.concurrent.TimeUnit;
2933

3034
/**
@@ -139,7 +143,7 @@ else if ( logDebug ) {
139143
LoggerConfiguration.configure(level);
140144
}
141145

142-
public int run() {
146+
public int doRun() {
143147
init();
144148
outputMainInformation();
145149

@@ -148,18 +152,9 @@ public int run() {
148152
final List<Reporter> reporterList;
149153

150154
final File baseDir = new File("").getAbsoluteFile();
151-
final FileMapperOptions[] sourceMappingOptions = {null};
152-
final FileMapperOptions[] testMappingOptions = {null};
153-
154155
final int[] returnCode = {0};
155156

156-
sourceMappingOptions[0] = getFileMapperOptionsByParamListItem(this.sourcePathParams, baseDir);
157-
testMappingOptions[0] = getFileMapperOptionsByParamListItem(this.testPathParams, baseDir);
158-
159-
final List<String> finalIncludeObjectsList = getObjectList(includeObjects);
160-
final List<String> finalExcludeObjectsList = getObjectList(excludeObjects);
161-
162-
final DataSource dataSource = DataSourceProvider.getDataSource(getConnectionInfo(), getReporterManager().getNumberOfReporters() + 1);
157+
final DataSource dataSource = DataSourceProvider.getDataSource(getConnectionInfo(), getReporterManager().getNumberOfReporters() + 2);
163158

164159
initDatabase(dataSource);
165160
reporterList = initReporters(dataSource);
@@ -173,33 +168,50 @@ public int run() {
173168
ExecutorService executorService = Executors.newFixedThreadPool(1 + reporterList.size());
174169

175170
// Run tests.
176-
executorService.submit(() -> {
177-
try (Connection conn = dataSource.getConnection()) {
178-
TestRunner testRunner = new TestRunner()
179-
.addPathList(testPaths)
180-
.addReporterList(reporterList)
181-
.sourceMappingOptions(sourceMappingOptions[0])
182-
.testMappingOptions(testMappingOptions[0])
183-
.colorConsole(this.colorConsole)
184-
.failOnErrors(true)
185-
.skipCompatibilityCheck(skipCompatibilityCheck)
186-
.includeObjects(finalIncludeObjectsList)
187-
.excludeObjects(finalExcludeObjectsList);
171+
Future<Integer> future = executorService.submit(() -> {
172+
Connection conn = null;
173+
try {
174+
conn = dataSource.getConnection();
175+
TestRunner testRunner = newTestRunner(reporterList);
188176

189177
logger.info("Running tests now.");
190178
logger.info("--------------------------------------");
191179
testRunner.run(conn);
192180
} catch (SomeTestsFailedException e) {
193181
returnCode[0] = this.failureExitCode;
194-
} catch (SQLException e) {
182+
}
183+
catch (OracleCreateStatmenetStuckException e ) {
184+
try {
185+
conn.abort(Executors.newSingleThreadExecutor());
186+
conn = null;
187+
} catch (SQLException e1) {
188+
logger.error(e1.getMessage(), e1);
189+
}
190+
executorService.shutdownNow();
191+
return 3;
192+
}
193+
catch (SQLException e) {
195194
System.out.println(e.getMessage());
196-
returnCode[0] = Cli.DEFAULT_ERROR_CODE;
195+
//returnCode[0] = Cli.DEFAULT_ERROR_CODE;
197196
executorService.shutdownNow();
197+
return Cli.DEFAULT_ERROR_CODE;
198198
}
199+
finally {
200+
if ( conn != null ) {
201+
try {
202+
conn.close();
203+
} catch (SQLException e) {
204+
e.printStackTrace();
205+
}
206+
}
207+
}
208+
return 0;
199209
});
200210

201211
// Gather each reporter results on a separate thread.
202-
getReporterManager().startReporterGatherers(executorService, dataSource, returnCode);
212+
getReporterManager().startReporterGatherers(executorService, dataSource);
213+
214+
Integer mainTestResult = future.get();
203215

204216
executorService.shutdown();
205217
if ( !executorService.awaitTermination(timeoutInMinutes, TimeUnit.MINUTES) ) {
@@ -209,7 +221,9 @@ public int run() {
209221
logger.info("--------------------------------------");
210222
logger.info("All tests done.");
211223

212-
return returnCode[0];
224+
((HikariDataSource)dataSource).close();
225+
226+
return mainTestResult;
213227
}
214228
catch ( DatabaseNotCompatibleException | UtPLSQLNotInstalledException | DatabaseConnectionFailed | ReporterTimeoutException e ) {
215229
System.out.println(e.getMessage());
@@ -219,6 +233,34 @@ public int run() {
219233
return Cli.DEFAULT_ERROR_CODE;
220234
}
221235

236+
public int run() {
237+
int i = 1;
238+
int exitCode = doRun();
239+
// Retry
240+
while ( exitCode == 3 && i<10 ) {
241+
logger.warn("Retry");
242+
exitCode = doRun();
243+
i++;
244+
}
245+
return exitCode;
246+
}
247+
248+
private TestRunner newTestRunner( List<Reporter> reporterList) {
249+
250+
final File baseDir = new File("").getAbsoluteFile();
251+
252+
return new TestRunner()
253+
.addPathList(testPaths)
254+
.addReporterList(reporterList)
255+
.sourceMappingOptions(getFileMapperOptionsByParamListItem(this.sourcePathParams, baseDir))
256+
.testMappingOptions(getFileMapperOptionsByParamListItem(this.testPathParams, baseDir))
257+
.colorConsole(this.colorConsole)
258+
.failOnErrors(true)
259+
.skipCompatibilityCheck(skipCompatibilityCheck)
260+
.includeObjects(getObjectList(includeObjects))
261+
.excludeObjects(getObjectList(excludeObjects));
262+
}
263+
222264
private ArrayList<String> getObjectList(String includeObjects) {
223265
ArrayList<String> includeObjectsList;
224266
if (includeObjects != null && !includeObjects.isEmpty()) {

‎src/main/java/org/utplsql/cli/TestRunnerTask.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package org.utplsql.cli;
2+
3+
import org.utplsql.api.TestRunner;
4+
5+
import java.sql.Connection;
6+
import java.util.concurrent.ExecutorService;
7+
8+
class TestRunnerTask implements Runnable {
9+
10+
private Connection con;
11+
private TestRunner testRunner;
12+
private ExecutorService executorService;
13+
14+
TestRunnerTask(Connection con, TestRunner testRunner, ExecutorService executorService ) {
15+
this.con = con;
16+
this.testRunner = testRunner;
17+
this.executorService = executorService;
18+
}
19+
20+
@Override
21+
public void run() {
22+
23+
}
24+
}

‎src/test/java/org/utplsql/cli/RunCommandIssue20Test.java‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
package org.utplsql.cli;
2+
3+
import java.util.List;
4+
5+
import org.junit.jupiter.api.Test;
6+
import org.slf4j.Logger;
7+
import org.slf4j.LoggerFactory;
8+
import org.utplsql.api.reporter.CoreReporters;
9+
10+
import static org.junit.jupiter.api.Assertions.assertEquals;
11+
import static org.junit.jupiter.api.Assertions.assertTrue;
12+
13+
/**
14+
* Unit test for run command.
15+
*/
16+
class RunCommandIssue20Test {
17+
18+
private static final Logger logger = LoggerFactory.getLogger(RunCommandIssue20Test.class);
19+
20+
@Test
21+
void runLoop() {
22+
RunCommand runCmd = TestHelper.createRunCommand(
23+
TestHelper.getConnectionString(),
24+
"-p=TEST_BETWNSTR.normal_case",
25+
"-f=ut_documentation_reporter");
26+
List<ReporterOptions> reporterOptionsList = runCmd.getReporterOptionsList();
27+
ReporterOptions reporterOptions1 = reporterOptionsList.get(0);
28+
assertEquals(CoreReporters.UT_DOCUMENTATION_REPORTER.name(), reporterOptions1.getReporterName());
29+
assertTrue(reporterOptions1.outputToScreen());
30+
// Loop in same JVM, uses a lot of new connections without closing existing ones, this might lead to
31+
// "Could not establish connection to database. Reason: IO Error: Got minus one from a read call"
32+
// before hitting the hanger at oracle.jdbc.driver.OracleStruct.getOracleAttributes(OracleStruct.java:347)
33+
// You may increase processes and implicitly sessions by "alter system set processes=1024 scope=spfile;"
34+
for (int i=0; i <= 120; i++) {
35+
logger.info("=======================");
36+
logger.info("Loop number " + i);
37+
logger.info("=======================");
38+
int result = runCmd.run();
39+
if (result != 0) {
40+
logger.error("Got an error during run. Return Code was " + result + "." );
41+
break;
42+
}
43+
}
44+
}
45+
46+
}

0 commit comments

Comments
 (0)