diff --git a/data-migration/src/main/java/com/quorum/tessera/data/migration/BdbDumpFile.java b/data-migration/src/main/java/com/quorum/tessera/data/migration/BdbDumpFile.java index 70f964ba27..d2ffecdf6d 100644 --- a/data-migration/src/main/java/com/quorum/tessera/data/migration/BdbDumpFile.java +++ b/data-migration/src/main/java/com/quorum/tessera/data/migration/BdbDumpFile.java @@ -1,7 +1,9 @@ package com.quorum.tessera.data.migration; import java.io.BufferedReader; +import java.io.ByteArrayInputStream; import java.io.IOException; +import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.util.*; @@ -18,9 +20,9 @@ public class BdbDumpFile implements StoreLoader { @Override - public Map load(Path inputFile) throws IOException { + public Map load(Path inputFile) throws IOException { - Map results = new HashMap<>(); + Map results = new HashMap<>(); try (BufferedReader reader = Files.newBufferedReader(inputFile)) { @@ -38,8 +40,11 @@ public Map load(Path inputFile) throws IOException { final String value = reader.readLine(); - - results.put(Base64.getDecoder().decode(Hex.decode(key)), Hex.decode(value)); + InputStream inputStream = Optional.of(value) + .map(Hex::decode) + .map(ByteArrayInputStream::new) + .get(); + results.put(Base64.getDecoder().decode(Hex.decode(key)), inputStream); } return Collections.unmodifiableMap(results); diff --git a/data-migration/src/main/java/com/quorum/tessera/data/migration/CmdLineExecutor.java b/data-migration/src/main/java/com/quorum/tessera/data/migration/CmdLineExecutor.java index bee14cdfe2..17082ffdd6 100644 --- a/data-migration/src/main/java/com/quorum/tessera/data/migration/CmdLineExecutor.java +++ b/data-migration/src/main/java/com/quorum/tessera/data/migration/CmdLineExecutor.java @@ -113,7 +113,7 @@ protected static int execute(String... args) throws Exception { final StoreLoader storeLoader = StoreLoader.create(storeType); final Path inputpath = Paths.get(line.getOptionValue("inputpath")); - final Map data = storeLoader.load(inputpath); + final Map data = storeLoader.load(inputpath); final String username = line.getOptionValue("dbuser"); final String password = line.getOptionValue("dbpass"); diff --git a/data-migration/src/main/java/com/quorum/tessera/data/migration/DataExporter.java b/data-migration/src/main/java/com/quorum/tessera/data/migration/DataExporter.java index 5f36574975..8ed4147973 100644 --- a/data-migration/src/main/java/com/quorum/tessera/data/migration/DataExporter.java +++ b/data-migration/src/main/java/com/quorum/tessera/data/migration/DataExporter.java @@ -1,11 +1,12 @@ package com.quorum.tessera.data.migration; +import java.io.InputStream; import java.nio.file.Path; import java.sql.SQLException; import java.util.Map; public interface DataExporter { - void export(Map data, Path output, String username, String password) throws SQLException; + void export(Map data, Path output, String username, String password) throws SQLException; } diff --git a/data-migration/src/main/java/com/quorum/tessera/data/migration/DirectoryStoreFile.java b/data-migration/src/main/java/com/quorum/tessera/data/migration/DirectoryStoreFile.java index b6edc4b55c..d098cb0244 100644 --- a/data-migration/src/main/java/com/quorum/tessera/data/migration/DirectoryStoreFile.java +++ b/data-migration/src/main/java/com/quorum/tessera/data/migration/DirectoryStoreFile.java @@ -2,6 +2,7 @@ import com.quorum.tessera.io.FilesDelegate; import java.io.IOException; +import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.util.Map; @@ -15,7 +16,7 @@ public class DirectoryStoreFile implements StoreLoader { private final FilesDelegate fileDelegate = FilesDelegate.create(); @Override - public Map load(Path directory) throws IOException { + public Map load(Path directory) throws IOException { Optional.ofNullable(directory) .filter(p -> p.toFile().isDirectory()) @@ -24,7 +25,7 @@ public Map load(Path directory) throws IOException { try (Stream stream = Files.list(directory)) { return stream.collect(Collectors.toMap( p -> new Base32().decode(p.toFile().getName()), - p -> fileDelegate.readAllBytes(p))); + p -> fileDelegate.newInputStream(p))); } } diff --git a/data-migration/src/main/java/com/quorum/tessera/data/migration/H2DataExporter.java b/data-migration/src/main/java/com/quorum/tessera/data/migration/H2DataExporter.java index 16b51c3ef9..8c04ec3541 100644 --- a/data-migration/src/main/java/com/quorum/tessera/data/migration/H2DataExporter.java +++ b/data-migration/src/main/java/com/quorum/tessera/data/migration/H2DataExporter.java @@ -1,5 +1,6 @@ package com.quorum.tessera.data.migration; +import java.io.InputStream; import java.net.URL; import java.nio.file.Path; import java.sql.SQLException; @@ -10,7 +11,7 @@ public class H2DataExporter implements DataExporter { private static final String INSERT_ROW = "INSERT INTO ENCRYPTED_TRANSACTION (HASH,ENCODED_PAYLOAD) VALUES (?,?)"; @Override - public void export(final Map data, + public void export(final Map data, final Path output, final String username, final String password) throws SQLException { diff --git a/data-migration/src/main/java/com/quorum/tessera/data/migration/JdbcDataExporter.java b/data-migration/src/main/java/com/quorum/tessera/data/migration/JdbcDataExporter.java index a7dfd70722..20cf29dadf 100644 --- a/data-migration/src/main/java/com/quorum/tessera/data/migration/JdbcDataExporter.java +++ b/data-migration/src/main/java/com/quorum/tessera/data/migration/JdbcDataExporter.java @@ -2,6 +2,7 @@ import com.quorum.tessera.io.IOCallback; import com.quorum.tessera.io.UriCallback; +import java.io.InputStream; import java.net.URL; import java.nio.file.Files; @@ -29,7 +30,7 @@ public JdbcDataExporter(String jdbcUrl, String insertRow, URL ddl) { } @Override - public void export(Map data, Path output, String username, String password) throws SQLException { + public void export(Map data, Path output, String username, String password) throws SQLException { try (Connection conn = DriverManager.getConnection(jdbcUrl, username, password)) { @@ -40,9 +41,9 @@ public void export(Map data, Path output, String username, Strin } try (PreparedStatement insertStatement = conn.prepareStatement(insertRow)) { - for (Entry values : data.entrySet()) { + for (Entry values : data.entrySet()) { insertStatement.setBytes(1, values.getKey()); - insertStatement.setBytes(2, values.getValue()); + insertStatement.setBinaryStream(2, values.getValue()); insertStatement.execute(); } } diff --git a/data-migration/src/main/java/com/quorum/tessera/data/migration/SqliteDataExporter.java b/data-migration/src/main/java/com/quorum/tessera/data/migration/SqliteDataExporter.java index a014f86517..1de85a408f 100644 --- a/data-migration/src/main/java/com/quorum/tessera/data/migration/SqliteDataExporter.java +++ b/data-migration/src/main/java/com/quorum/tessera/data/migration/SqliteDataExporter.java @@ -1,8 +1,18 @@ package com.quorum.tessera.data.migration; -import java.net.URL; +import com.quorum.tessera.io.IOCallback; +import com.quorum.tessera.io.UriCallback; +import java.io.InputStream; +import java.net.URI; +import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; import java.sql.SQLException; +import java.sql.Statement; +import java.util.List; import java.util.Map; public class SqliteDataExporter implements DataExporter { @@ -10,16 +20,34 @@ public class SqliteDataExporter implements DataExporter { private static final String INSERT_ROW = "INSERT INTO ENCRYPTED_TRANSACTION (HASH,ENCODED_PAYLOAD) VALUES (?,?)"; @Override - public void export(Map data, Path output, final String username, final String password) throws SQLException { + public void export(Map data, Path output, String username, String password) throws SQLException { final String connectionString = "jdbc:sqlite:" + output.toString(); - final URL sqlFile = getClass().getResource("/ddls/h2-ddl.sql"); + final URI sqlFile = UriCallback.execute(() -> getClass().getResource("/ddls/sqlite-ddl.sql").toURI()); - final JdbcDataExporter jdbcDataExporter = new JdbcDataExporter(connectionString, INSERT_ROW, sqlFile); + List createTables = IOCallback.execute(() -> Files.readAllLines(Paths.get(sqlFile))); - jdbcDataExporter.export(data, output, username, password); + try (Connection conn = DriverManager.getConnection(connectionString, username, password)) { + try (Statement stmt = conn.createStatement()) { + for (String createTable : createTables) { + stmt.executeUpdate(createTable); + } + } + + try (PreparedStatement insertStatement = conn.prepareStatement(INSERT_ROW)) { + for (Map.Entry values : data.entrySet()) { + insertStatement.setBytes(1, values.getKey()); + + insertStatement.setBytes(2, Utils.toByteArray(values.getValue())); + + insertStatement.execute(); + } + } + + } } + } diff --git a/data-migration/src/main/java/com/quorum/tessera/data/migration/SqliteLoader.java b/data-migration/src/main/java/com/quorum/tessera/data/migration/SqliteLoader.java index 955d23f2cc..c32539005b 100644 --- a/data-migration/src/main/java/com/quorum/tessera/data/migration/SqliteLoader.java +++ b/data-migration/src/main/java/com/quorum/tessera/data/migration/SqliteLoader.java @@ -1,6 +1,8 @@ package com.quorum.tessera.data.migration; +import java.io.ByteArrayInputStream; import java.io.IOException; +import java.io.InputStream; import java.nio.file.Path; import java.sql.Connection; import java.sql.DriverManager; @@ -13,7 +15,7 @@ public class SqliteLoader implements StoreLoader { @Override - public Map load(Path input) throws IOException { + public Map load(Path input) throws IOException { final String url = "jdbc:sqlite:" + input.toString(); @@ -23,11 +25,11 @@ public Map load(Path input) throws IOException { Statement statement = conn.createStatement(); ResultSet results = statement.executeQuery("SELECT * FROM payload")) { - Map loadedData = new HashMap<>(); + Map loadedData = new HashMap<>(); while (results.next()) { byte[] key = results.getBytes("key"); - byte[] value = results.getBytes("bytes"); + InputStream value = new ByteArrayInputStream(results.getBytes("bytes")); loadedData.put(key, value); diff --git a/data-migration/src/main/java/com/quorum/tessera/data/migration/StoreLoader.java b/data-migration/src/main/java/com/quorum/tessera/data/migration/StoreLoader.java index 567cf5884f..1826913c66 100644 --- a/data-migration/src/main/java/com/quorum/tessera/data/migration/StoreLoader.java +++ b/data-migration/src/main/java/com/quorum/tessera/data/migration/StoreLoader.java @@ -1,6 +1,7 @@ package com.quorum.tessera.data.migration; import java.io.IOException; +import java.io.InputStream; import java.nio.file.Path; import java.util.Collections; import java.util.HashMap; @@ -9,18 +10,23 @@ public interface StoreLoader { - Map load(Path input) throws IOException; + + + Map load(Path input) throws IOException; Map LOOKUP = Collections.unmodifiableMap( - new HashMap() {{ + new HashMap() { + { put(StoreType.BDB, new BdbDumpFile()); put(StoreType.DIR, new DirectoryStoreFile()); put(StoreType.SQLITE, new SqliteLoader()); - }} + } + } ); static StoreLoader create(StoreType storeType) { return Optional.ofNullable(LOOKUP.get(storeType)).get(); } + } diff --git a/data-migration/src/main/java/com/quorum/tessera/data/migration/Utils.java b/data-migration/src/main/java/com/quorum/tessera/data/migration/Utils.java new file mode 100644 index 0000000000..30ef651913 --- /dev/null +++ b/data-migration/src/main/java/com/quorum/tessera/data/migration/Utils.java @@ -0,0 +1,22 @@ +package com.quorum.tessera.data.migration; + +import com.quorum.tessera.io.IOCallback; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; + +public interface Utils { + + static byte[] toByteArray(InputStream in) { + return IOCallback.execute(() -> { + ByteArrayOutputStream os = new ByteArrayOutputStream(); + + byte[] buffer = new byte[1024]; + int len; + while ((len = in.read(buffer)) != -1) { + os.write(buffer, 0, len); + } + + return os.toByteArray(); + }); + } +} diff --git a/data-migration/src/test/java/com/quorum/tessera/data/migration/BdbDumpFileTest.java b/data-migration/src/test/java/com/quorum/tessera/data/migration/BdbDumpFileTest.java index 76ddcd4392..0c7c16d4db 100644 --- a/data-migration/src/test/java/com/quorum/tessera/data/migration/BdbDumpFileTest.java +++ b/data-migration/src/test/java/com/quorum/tessera/data/migration/BdbDumpFileTest.java @@ -1,6 +1,7 @@ package com.quorum.tessera.data.migration; import java.io.IOException; +import java.io.InputStream; import java.net.URISyntaxException; import java.nio.file.Path; import java.nio.file.Paths; @@ -16,7 +17,7 @@ public void loadSample() throws URISyntaxException, IOException { Path inputFile = Paths.get(getClass().getResource("/bdb/bdb-sample.txt").toURI()); - Map results = new BdbDumpFile().load(inputFile); + Map results = new BdbDumpFile().load(inputFile); assertThat(results).hasSize(12); @@ -29,7 +30,7 @@ public void loadSimpleEntrySample() throws URISyntaxException, IOException { Path inputFile = Paths.get(getClass().getResource("/bdb/single-entry.txt").toURI()); - Map results = new BdbDumpFile().load(inputFile); + Map results = new BdbDumpFile().load(inputFile); assertThat(results).hasSize(1); diff --git a/data-migration/src/test/java/com/quorum/tessera/data/migration/DirectoryStoreFileTest.java b/data-migration/src/test/java/com/quorum/tessera/data/migration/DirectoryStoreFileTest.java index a4f978aa57..277a5b0fbe 100644 --- a/data-migration/src/test/java/com/quorum/tessera/data/migration/DirectoryStoreFileTest.java +++ b/data-migration/src/test/java/com/quorum/tessera/data/migration/DirectoryStoreFileTest.java @@ -1,24 +1,53 @@ package com.quorum.tessera.data.migration; +import java.io.InputStream; +import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Map; +import java.util.Random; +import java.util.UUID; + import static org.assertj.core.api.Assertions.assertThat; + import org.junit.Test; public class DirectoryStoreFileTest { - + @Test public void load() throws Exception { - + Path directory = Paths.get(getClass().getResource("/dir/").toURI()); - + DirectoryStoreFile directoryStoreFile = new DirectoryStoreFile(); - - Map results = directoryStoreFile.load(directory); - + + Map results = directoryStoreFile.load(directory); + assertThat(results).hasSize(22); + + } + + @Test + public void loadLarge() throws Exception { + + Path baseDir = Paths.get(getClass().getResource("/").toURI()); + Path directory = baseDir.resolve(UUID.randomUUID().toString()); + + Files.createDirectories(directory); + + Path largeFile = Paths.get(directory.toAbsolutePath().toString(), "loadLarge"); + + Random random = new Random(); + byte[] data = new byte[33554432]; + random.nextBytes(data); + Files.write(largeFile, data); + + DirectoryStoreFile directoryStoreFile = new DirectoryStoreFile(); + + Map results = directoryStoreFile.load(directory); + + assertThat(results).hasSize(1); } - + } diff --git a/data-migration/src/test/java/com/quorum/tessera/data/migration/H2DataExporterTest.java b/data-migration/src/test/java/com/quorum/tessera/data/migration/H2DataExporterTest.java index 6367b5a1b5..57e345693a 100644 --- a/data-migration/src/test/java/com/quorum/tessera/data/migration/H2DataExporterTest.java +++ b/data-migration/src/test/java/com/quorum/tessera/data/migration/H2DataExporterTest.java @@ -1,5 +1,6 @@ package com.quorum.tessera.data.migration; +import java.io.ByteArrayInputStream; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -8,6 +9,7 @@ import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.sql.*; @@ -52,8 +54,8 @@ public void exportSingleLine() throws SQLException, IOException { Path outputpath = Files.createTempFile("exportSingleLine", ".db"); - Map singleLineData = new HashMap<>(); - singleLineData.put("HASH".getBytes(), "VALUE".getBytes()); + Map singleLineData = new HashMap<>(); + singleLineData.put("HASH".getBytes(), new ByteArrayInputStream("VALUE".getBytes())); exporter.export(singleLineData, outputpath, null, null); @@ -88,8 +90,8 @@ public void exportSingleLineWithUsernameAndPassword() throws SQLException, IOExc final Path outputpath = Files.createTempFile("exportSingleLine", ".db"); - final Map singleLineData = new HashMap<>(); - singleLineData.put("HASH".getBytes(), "VALUE".getBytes()); + final Map singleLineData = new HashMap<>(); + singleLineData.put("HASH".getBytes(), new ByteArrayInputStream("VALUE".getBytes())); exporter.export(singleLineData, outputpath, username, password); @@ -124,8 +126,8 @@ public void exportSingleLineWithUsernameAndPasswordFailsWhenReading() throws SQL final Path outputpath = Files.createTempFile("exportSingleLine", ".db"); - final Map singleLineData = new HashMap<>(); - singleLineData.put("HASH".getBytes(), "VALUE".getBytes()); + final Map singleLineData = new HashMap<>(); + singleLineData.put("HASH".getBytes(), new ByteArrayInputStream("VALUE".getBytes())); exporter.export(singleLineData, outputpath, username, password); diff --git a/data-migration/src/test/java/com/quorum/tessera/data/migration/JdbcDataExporterTest.java b/data-migration/src/test/java/com/quorum/tessera/data/migration/JdbcDataExporterTest.java index bcc386a2fe..dd16610b87 100644 --- a/data-migration/src/test/java/com/quorum/tessera/data/migration/JdbcDataExporterTest.java +++ b/data-migration/src/test/java/com/quorum/tessera/data/migration/JdbcDataExporterTest.java @@ -2,6 +2,8 @@ import com.mockrunner.jdbc.BasicJDBCTestCaseAdapter; import com.mockrunner.mock.jdbc.JDBCMockObjectFactory; +import java.io.ByteArrayInputStream; +import java.io.InputStream; import org.junit.After; import org.junit.Test; @@ -36,8 +38,8 @@ public void doStuff() throws Exception { JdbcDataExporter exporter = new JdbcDataExporter("jdbc:bogus","insert stuff",sqlFile.toUri().toURL()); - Map data = new HashMap() {{ - put("ONE".getBytes(),"TWO".getBytes()); + Map data = new HashMap() {{ + put("ONE".getBytes(),new ByteArrayInputStream("TWO".getBytes())); }}; Path output = mock(Path.class); diff --git a/data-migration/src/test/java/com/quorum/tessera/data/migration/MockDataExporter.java b/data-migration/src/test/java/com/quorum/tessera/data/migration/MockDataExporter.java index 94e58f59aa..7b677801e9 100644 --- a/data-migration/src/test/java/com/quorum/tessera/data/migration/MockDataExporter.java +++ b/data-migration/src/test/java/com/quorum/tessera/data/migration/MockDataExporter.java @@ -1,11 +1,12 @@ package com.quorum.tessera.data.migration; +import java.io.InputStream; import java.nio.file.Path; import java.util.Map; public class MockDataExporter implements DataExporter { - private Map results; + private Map results; private Path path; @@ -14,14 +15,14 @@ public class MockDataExporter implements DataExporter { private String password; @Override - public void export(Map data, Path path, String username, String password) { + public void export(Map data, Path path, String username, String password) { this.results = data; this.path = path; this.username = username; this.password = password; } - public Map getResults() { + public Map getResults() { return results; } diff --git a/data-migration/src/test/java/com/quorum/tessera/data/migration/SqliteDataExporterTest.java b/data-migration/src/test/java/com/quorum/tessera/data/migration/SqliteDataExporterTest.java index ca8b0e1b8c..93100ccdea 100644 --- a/data-migration/src/test/java/com/quorum/tessera/data/migration/SqliteDataExporterTest.java +++ b/data-migration/src/test/java/com/quorum/tessera/data/migration/SqliteDataExporterTest.java @@ -1,5 +1,6 @@ package com.quorum.tessera.data.migration; +import java.io.ByteArrayInputStream; import org.junit.After; import org.junit.Before; import org.junit.Rule; @@ -8,6 +9,7 @@ import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.sql.*; @@ -47,8 +49,8 @@ public void onTearDown() throws IOException { @Test public void exportSingleLine() throws SQLException, IOException { - Map singleLineData = new HashMap<>(); - singleLineData.put("HASH".getBytes(), "VALUE".getBytes()); + Map singleLineData = new HashMap<>(); + singleLineData.put("HASH".getBytes(), new ByteArrayInputStream("VALUE".getBytes())); exporter.export(singleLineData, outputPath, null, null); @@ -82,8 +84,8 @@ public void exportSingleLineWithUsernameAndPassword() throws SQLException { final String username = "sa"; final String password = "pass"; - final Map singleLineData = new HashMap<>(); - singleLineData.put("HASH".getBytes(), "VALUE".getBytes()); + final Map singleLineData = new HashMap<>(); + singleLineData.put("HASH".getBytes(), new ByteArrayInputStream("VALUE".getBytes())); exporter.export(singleLineData, outputPath, username, password); diff --git a/data-migration/src/test/java/com/quorum/tessera/data/migration/SqliteLoaderTest.java b/data-migration/src/test/java/com/quorum/tessera/data/migration/SqliteLoaderTest.java index d59b7fec04..2a20e6ff92 100644 --- a/data-migration/src/test/java/com/quorum/tessera/data/migration/SqliteLoaderTest.java +++ b/data-migration/src/test/java/com/quorum/tessera/data/migration/SqliteLoaderTest.java @@ -1,6 +1,7 @@ package com.quorum.tessera.data.migration; import java.io.IOException; +import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.sql.Connection; @@ -37,7 +38,7 @@ public void doGenerateSample() throws Exception { dbfilePath = Files.createTempFile("sample", ".db"); try (Connection conn = DriverManager.getConnection("jdbc:sqlite:" + dbfilePath); - Statement statement = conn.createStatement();) { + Statement statement = conn.createStatement();) { statement.execute("CREATE TABLE payload (key LONGVARBINARY,bytes LONGVARBINARY)"); try (PreparedStatement insertStatement = conn.prepareStatement("INSERT INTO payload (key,bytes) values (?,?)")) { for (Entry entry : fixtures.entrySet()) { @@ -60,15 +61,17 @@ public void onTearDown() throws Exception { @Test public void load() throws IOException { - Map results = loader.load(dbfilePath); + Map results = loader.load(dbfilePath); assertThat(results).hasSize(fixtures.size()); Map resultz = results.entrySet().stream() - .collect(Collectors.toMap(entry -> new String(entry.getKey()), entry -> new String(entry.getValue()))); + .collect(Collectors.toMap(entry -> new String(entry.getKey()), entry -> new String(Utils.toByteArray(entry.getValue())))); assertThat(resultz).containsAllEntriesOf(fixtures); } + + } diff --git a/tests/acceptance-test/src/test/java/exec/EnclaveExecManager.java b/tests/acceptance-test/src/test/java/exec/EnclaveExecManager.java index 87ac74e332..e2d4a4934a 100644 --- a/tests/acceptance-test/src/test/java/exec/EnclaveExecManager.java +++ b/tests/acceptance-test/src/test/java/exec/EnclaveExecManager.java @@ -71,7 +71,7 @@ public Process doStart() throws Exception { Future future = executorService.submit(serverStatusCheckExecutor); - Boolean result = future.get(2, TimeUnit.MINUTES); + Boolean result = future.get(3, TimeUnit.MINUTES); if (!result) { throw new IllegalStateException("Enclave server not started"); diff --git a/tests/acceptance-test/src/test/java/suite/HttpsServerStatusCheck.java b/tests/acceptance-test/src/test/java/suite/HttpsServerStatusCheck.java index 4a8de48279..10552d0307 100644 --- a/tests/acceptance-test/src/test/java/suite/HttpsServerStatusCheck.java +++ b/tests/acceptance-test/src/test/java/suite/HttpsServerStatusCheck.java @@ -32,6 +32,8 @@ public boolean checkStatus() { return true; } catch (IOException ex) { + LOGGER.warn(ex.getMessage()); + LOGGER.debug(null, ex); return false; } finally { if (httpsConnection != null) { diff --git a/tests/acceptance-test/src/test/java/suite/ServerStatusCheckExecutor.java b/tests/acceptance-test/src/test/java/suite/ServerStatusCheckExecutor.java index 1589f3d02a..cf49daa7e1 100644 --- a/tests/acceptance-test/src/test/java/suite/ServerStatusCheckExecutor.java +++ b/tests/acceptance-test/src/test/java/suite/ServerStatusCheckExecutor.java @@ -18,6 +18,7 @@ public ServerStatusCheckExecutor(ServerStatusCheck serverStatusCheck) { @Override public Boolean call() throws Exception { + LOGGER.info("Connecting {}",serverStatusCheck); do { LOGGER.debug("Unable to connect try again in 1 sec. {}",serverStatusCheck); TimeUnit.SECONDS.sleep(1);