[tor-commits] [exonerator/master] Improve logging of database importer.
karsten at torproject.org
karsten at torproject.org
Wed Apr 8 13:44:22 UTC 2020
commit 54ad288276bd2313ff81a71406f027801e51fa55
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Sun Mar 15 14:31:10 2020 +0100
Improve logging of database importer.
This patch focuses on providing more context in log messages and unify
the use of log levels. It also adds counters and timestamps as far as
they are being used in log messages. And in very few cases it contains
minor changes like using try-with-resource when we're touching that
code anyway. But most other refactorings are left as future work.
Fixes the first part of #24542. The second part will be to improve
logging of the web server parts.
---
CHANGELOG.md | 3 +
.../exonerator/ExoneraTorDatabaseImporter.java | 239 ++++++++++++++++-----
2 files changed, 186 insertions(+), 56 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c87922..ca10ec2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
# Changes in version 4.?.? - 2020-0?-??
+ * Minor changes
+ - Improve logging of the database importer.
+
# Changes in version 4.3.0 - 2020-01-15
diff --git a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
index 3dbb119..53e58f7 100644
--- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
+++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorDatabaseImporter.java
@@ -11,6 +11,7 @@ import org.torproject.descriptor.ExitList;
import org.torproject.descriptor.ExitList.Entry;
import org.torproject.descriptor.NetworkStatusEntry;
import org.torproject.descriptor.RelayNetworkStatusConsensus;
+import org.torproject.descriptor.UnparseableDescriptor;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Base64;
@@ -25,7 +26,9 @@ import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.LineNumberReader;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.sql.CallableStatement;
import java.sql.Connection;
@@ -49,46 +52,65 @@ public class ExoneraTorDatabaseImporter {
/** Main function controlling the parsing process. */
public static void main(String[] args) {
+ logger.info("Starting ExoneraTor database importer.");
readConfiguration();
openDatabaseConnection();
prepareDatabaseStatements();
createLockFile();
+ logger.info("Fetching descriptors from CollecTor.");
fetchDescriptors();
+ logger.info("Importing descriptors into the database.");
readImportHistoryToMemory();
parseDescriptors();
writeImportHistoryToDisk();
closeDatabaseConnection();
deleteLockFile();
+ logger.info("Terminating ExoneraTor database importer.");
}
- /* JDBC string of the ExoneraTor database. */
+ /* JDBC string of the ExoneraTor database. Never include this in a log
+ * message, because it likely contains the database password! */
private static String jdbcString;
/* Directory from which to import descriptors. */
- private static String importDirString;
+ private static File importDirectory;
/* Learn JDBC string and directory to parse descriptors from. */
private static void readConfiguration() {
File configFile = new File("config");
if (!configFile.exists()) {
- logger.error("Could not find config file. Exiting.");
+ logger.error("Could not find configuration file {}. Make sure that this "
+ + "file exists. Exiting.", configFile.getAbsoluteFile());
System.exit(1);
}
- String line;
- try {
- BufferedReader br = new BufferedReader(new FileReader(configFile));
+ try (BufferedReader br = new BufferedReader(new FileReader(configFile))) {
+ String line;
while ((line = br.readLine()) != null) {
if (line.startsWith("ExoneraTorDatabaseJdbc")) {
jdbcString = line.split(" ")[1];
} else if (line.startsWith("ExoneraTorImportDirectory")) {
- importDirString = line.split(" ")[1];
+ importDirectory = new File(line.split(" ")[1]);
}
}
- br.close();
} catch (IOException e) {
- logger.error("Could not parse config file. Exiting.", e);
+ logger.error("Caught an I/O exception while reading configuration file "
+ + "{}. Make sure that this file is readable. Exiting.",
+ configFile.getAbsoluteFile(), e);
+ System.exit(1);
+ } catch (ArrayIndexOutOfBoundsException e) {
+ logger.error("Found invalid entry in configuration file {} containing "
+ + "fewer than 2 space-separated parts. Fix that line. Exiting.",
+ configFile.getAbsoluteFile());
+ System.exit(1);
+ }
+ if (null == jdbcString || null == importDirectory) {
+ logger.error("Missing at least one mandatory line in configuration file "
+ + "{}. Be sure to configure ExoneraTorDatabaseJdbc and "
+ + "ExoneraTorImportDirectory. Exiting.",
+ configFile.getAbsoluteFile());
System.exit(1);
}
+ logger.debug("Read configuration file {}.", configFile.getAbsoluteFile());
}
/* Database connection. */
@@ -99,9 +121,12 @@ public class ExoneraTorDatabaseImporter {
try {
connection = DriverManager.getConnection(jdbcString);
} catch (SQLException e) {
- logger.error("Could not connect to database. Exiting.", e);
+ logger.error("Caught an SQL exception while connecting to the database. "
+ + "Make sure that the database exists and that the configured JDBC "
+ + "string is correct.", e);
System.exit(1);
}
+ logger.debug("Connected to the database.");
}
/* Callable statements to import data into the database. */
@@ -117,8 +142,10 @@ public class ExoneraTorDatabaseImporter {
insertExitlistentryStatement = connection.prepareCall(
"{call insert_exitlistentry_exitaddress(?, ?, ?, ?)}");
} catch (SQLException e) {
- logger.warn("Could not prepare callable statements to "
- + "import data into the database. Exiting.", e);
+ logger.error("Caught an SQL exception while preparing callable "
+ + "statements for importing data into the database. Make sure that "
+ + "the configured database user has permissions to insert data. Also "
+ + "make sure that the database uses the correct database schema.", e);
System.exit(1);
}
}
@@ -127,30 +154,40 @@ public class ExoneraTorDatabaseImporter {
* tool to run concurrently. */
private static void createLockFile() {
File lockFile = new File("exonerator-lock");
- try {
- if (lockFile.exists()) {
- BufferedReader br = new BufferedReader(new FileReader(lockFile));
+ if (lockFile.exists()) {
+ try (BufferedReader br = new BufferedReader(new FileReader(lockFile))) {
Instant runStarted = Instant.ofEpochMilli(Long.parseLong(
br.readLine()));
- br.close();
if (runStarted.plus(Duration.ofHours(6L))
.compareTo(Instant.now()) >= 0) {
- logger.warn("File 'exonerator-lock' is less than 6 "
- + "hours old. Exiting.");
+ logger.error("Lock file {} is less than 6 hours old. Either make "
+ + "sure that there are no other ExoneraTor database importers "
+ + "running and manually delete that file, or wait until the file "
+ + "is 6 hours old when it will be overwritten automatically. "
+ + "Exiting.", lockFile.getAbsoluteFile());
System.exit(1);
} else {
- logger.warn("File 'exonerator-lock' is at least 6 hours old."
- + " Overwriting and executing anyway.");
+ logger.warn("Lock file {} is at least 6 hours old. Overwriting and "
+ + "continuing with the database import.",
+ lockFile.getAbsoluteFile());
}
+ } catch (IOException e) {
+ logger.error("Caught an I/O exception when reading existing lock file "
+ + "{}. Make sure that this file is readable. Exiting.",
+ lockFile.getAbsoluteFile(), e);
+ System.exit(1);
}
- BufferedWriter bw = new BufferedWriter(new FileWriter(
- "exonerator-lock"));
+ }
+ try (BufferedWriter bw = new BufferedWriter(new FileWriter(lockFile))) {
bw.append(String.valueOf(System.currentTimeMillis())).append("\n");
- bw.close();
} catch (IOException e) {
- logger.warn("Could not create 'exonerator-lock' file. Exiting.");
+ logger.error("Caught an I/O exception when creating lock file {}. Make "
+ + "sure that the parent directory exists and that the user running "
+ + "the ExoneraTor database importer has permissions to create the "
+ + "lock file. Exiting.", lockFile.getAbsoluteFile(), e);
System.exit(1);
}
+ logger.debug("Created lock file {}.", lockFile.getAbsoluteFile());
}
/* Fetch recent descriptors from CollecTor. */
@@ -159,7 +196,7 @@ public class ExoneraTorDatabaseImporter {
DescriptorSourceFactory.createDescriptorCollector();
collector.collectDescriptors("https://collector.torproject.org",
new String[] { "/recent/relay-descriptors/consensuses/",
- "/recent/exit-lists/" }, 0L, new File(importDirString), true);
+ "/recent/exit-lists/" }, 0L, importDirectory, true);
}
/* Last and next parse histories containing paths of parsed files and
@@ -168,34 +205,55 @@ public class ExoneraTorDatabaseImporter {
private static SortedMap<String, Long> nextImportHistory = new TreeMap<>();
+ /* Parse history file. */
+ private static File parseHistoryFile = new File("stats",
+ "exonerator-import-history");
+
/* Read stats/exonerator-import-history file from disk and remember
* locally when files were last parsed. */
private static void readImportHistoryToMemory() {
- File parseHistoryFile = new File("stats",
- "exonerator-import-history");
if (parseHistoryFile.exists()) {
- try (BufferedReader br = new BufferedReader(new FileReader(
- parseHistoryFile))) {
+ try (LineNumberReader lnr = new LineNumberReader(new FileReader(
+ parseHistoryFile))) {
String line;
- int lineNumber = 0;
- while ((line = br.readLine()) != null) {
- lineNumber++;
+ while ((line = lnr.readLine()) != null) {
+ Long lastModified = null;
+ String filename = null;
String[] parts = line.split(",");
- if (parts.length != 2) {
- logger.warn("File 'stats/exonerator-import-history' "
- + "contains a corrupt entry in line {}. "
- + "Ignoring parse history file entirely.", lineNumber);
+ if (parts.length == 2) {
+ try {
+ lastModified = Long.parseLong(parts[0]);
+ filename = parts[1];
+ } catch (NumberFormatException e) {
+ /* Handle below. */
+ }
+ }
+ if (null != lastModified && null != filename) {
+ lastImportHistory.put(filename, lastModified);
+ } else {
+ logger.warn("Read a corrupt entry in line {} of parse history file "
+ + "{}. Ignoring the parse history file entirely and moving on "
+ + "by parsing all descriptors in {}.",
+ lnr.getLineNumber(), parseHistoryFile.getAbsoluteFile(),
+ importDirectory.getAbsoluteFile());
lastImportHistory.clear();
return;
}
- long lastModified = Long.parseLong(parts[0]);
- String filename = parts[1];
- lastImportHistory.put(filename, lastModified);
}
} catch (IOException e) {
- logger.warn("Could not read import history. Ignoring.", e);
+ logger.warn("Caught an I/O exception while reading parse history file "
+ + "{}. Ignoring the parse history file entirely and moving on "
+ + "by parsing all descriptors in {}.",
+ parseHistoryFile.getAbsoluteFile(),
+ importDirectory.getAbsoluteFile(), e);
lastImportHistory.clear();
+ return;
}
+ logger.debug("Read parse history file {} and extracted {} entries.",
+ parseHistoryFile.getAbsoluteFile(), lastImportHistory.size());
+ } else {
+ logger.debug("Not reading parse history file {}, because it does not yet "
+ + "exist.", parseHistoryFile.getAbsoluteFile());
}
}
@@ -205,23 +263,48 @@ public class ExoneraTorDatabaseImporter {
DescriptorSourceFactory.createDescriptorReader();
descriptorReader.setMaxDescriptorsInQueue(20);
descriptorReader.setExcludedFiles(lastImportHistory);
+ int parsedConsensuses = 0;
+ int parsedExitLists = 0;
+ int unparseableDescriptors = 0;
for (Descriptor descriptor : descriptorReader.readDescriptors(
- new File(importDirString))) {
+ importDirectory)) {
if (descriptor instanceof RelayNetworkStatusConsensus) {
parseConsensus((RelayNetworkStatusConsensus) descriptor);
+ parsedConsensuses++;
} else if (descriptor instanceof ExitList) {
parseExitList((ExitList) descriptor);
+ parsedExitLists++;
+ } else if (descriptor instanceof UnparseableDescriptor) {
+ logger.debug("Found descriptor in {} to be unparseable. Check the "
+ + "descriptor parse exception and/or descriptor file for details. "
+ + "Skipping.",
+ descriptor.getDescriptorFile().getAbsoluteFile(),
+ ((UnparseableDescriptor) descriptor).getDescriptorParseException());
+ unparseableDescriptors++;
}
}
+ if (unparseableDescriptors > 0) {
+ logger.warn("Found {} descriptors in {} to be unparseable and skipped "
+ + "them. Check the debug-level logs and/or descriptor files for "
+ + "details. If this happened due to a bug in the parsing code, "
+ + "manually delete the parse history file {} and run the database "
+ + "importer again. Continuing.", unparseableDescriptors,
+ importDirectory.getAbsoluteFile(),
+ parseHistoryFile.getAbsoluteFile());
+ }
nextImportHistory.putAll(
descriptorReader.getExcludedFiles());
nextImportHistory.putAll(descriptorReader.getParsedFiles());
+ logger.debug("Read {} consensuses and {} exit lists from {}.",
+ parsedConsensuses, parsedExitLists, importDirectory.getAbsoluteFile());
}
/* Parse a consensus. */
private static void parseConsensus(RelayNetworkStatusConsensus consensus) {
+ Instant beforeParsingConsensus = Instant.now();
LocalDateTime validAfter = LocalDateTime.ofInstant(Instant.ofEpochMilli(
consensus.getValidAfterMillis()), ZoneOffset.UTC);
+ int importedStatusEntries = 0;
for (NetworkStatusEntry entry : consensus.getStatusEntries().values()) {
if (entry.getFlags().contains("Running")) {
String fingerprintBase64 = null;
@@ -230,8 +313,10 @@ public class ExoneraTorDatabaseImporter {
Hex.decodeHex(entry.getFingerprint().toCharArray()))
.replace("=", "");
} catch (DecoderException e) {
- logger.warn("Unable to decode hex fingerprint {} to convert it back "
- + "to base64. Aborting import.", entry.getFingerprint(), e);
+ logger.error("Caught a decoder exception while converting hex "
+ + "fingerprint {} found in consensus with valid-after time {} to "
+ + "base64. This looks like a bug. Exiting.",
+ entry.getFingerprint(), validAfter, e);
System.exit(1);
}
final String nickname = entry.getNickname();
@@ -248,8 +333,13 @@ public class ExoneraTorDatabaseImporter {
}
importStatusentry(validAfter, fingerprintBase64, nickname,
exit, orAddresses);
+ importedStatusEntries++;
}
}
+ logger.debug("Parsed consensus with valid-after time {} and imported {} "
+ + "status entries with the Running flag into the database in {}.",
+ validAfter, importedStatusEntries,
+ Duration.between(beforeParsingConsensus, Instant.now()));
}
/* Import a status entry with one or more OR addresses into the
@@ -304,8 +394,10 @@ public class ExoneraTorDatabaseImporter {
orAddress.replaceAll("[\\[\\]]", ""));
insertStatusentryStatement.setString(4, orAddress24);
} else {
- logger.error("Could not import status entry with IPv6 "
- + "address '{}'. Exiting.", orAddress);
+ logger.error("Unable to parse IPv6 address {} found in status "
+ + "entry with base64-encoded fingerprint {} in consensus with "
+ + "valid-after time {}. This is likely a bug. Exiting.",
+ orAddress, fingerprintBase64, validAfter);
System.exit(1);
}
}
@@ -314,13 +406,20 @@ public class ExoneraTorDatabaseImporter {
insertStatusentryStatement.execute();
}
} catch (SQLException e) {
- logger.error("Could not import status entry. Exiting.", e);
+ logger.error("Caught an SQL exception while importing status entry with "
+ + "base64-encoded fingerprint {} and valid-after time {}. Check the "
+ + "exception for details. Exiting.",
+ fingerprintBase64, validAfter, e);
System.exit(1);
}
}
/* Parse an exit list. */
private static void parseExitList(ExitList exitList) {
+ Instant beforeParsingExitList = Instant.now();
+ LocalDateTime downloaded = LocalDateTime.ofInstant(Instant.ofEpochMilli(
+ exitList.getDownloadedMillis()), ZoneOffset.UTC);
+ int importedExitListEntries = 0;
for (Entry entry : exitList.getEntries()) {
for (Map.Entry<String, Long> e : entry.getExitAddresses().entrySet()) {
String fingerprintBase64 = null;
@@ -329,8 +428,10 @@ public class ExoneraTorDatabaseImporter {
Hex.decodeHex(entry.getFingerprint().toCharArray()))
.replace("=", "");
} catch (DecoderException ex) {
- logger.warn("Unable to decode hex fingerprint {} to convert to "
- + "base64. Aborting import.", entry.getFingerprint(), ex);
+ logger.error("Caught a decoder exception while converting hex "
+ + "fingerprint {} found in exit list downloaded (by CollecTor) "
+ + "at {} to base64. This looks like a bug. Exiting.",
+ entry.getFingerprint(), downloaded, ex);
System.exit(1);
}
String exitAddress = e.getKey();
@@ -350,8 +451,13 @@ public class ExoneraTorDatabaseImporter {
Instant.ofEpochMilli(e.getValue()), ZoneOffset.UTC);
importExitlistentry(fingerprintBase64, exitAddress24, exitAddress,
scanned);
+ importedExitListEntries++;
}
}
+ logger.debug("Parsed exit list downloaded (by CollecTor) at {} and "
+ + "imported {} exit list entries into the database in {}.", downloaded,
+ importedExitListEntries,
+ Duration.between(beforeParsingExitList, Instant.now()));
}
/* Import an exit list entry into the database. */
@@ -365,15 +471,20 @@ public class ExoneraTorDatabaseImporter {
insertExitlistentryStatement.setObject(4, scanned);
insertExitlistentryStatement.execute();
} catch (SQLException e) {
- logger.error("Could not import exit list entry. Exiting.", e);
+ logger.error("Caught an SQL exception while importing exit list entry "
+ + "with base64-encoded fingerprint {}, exit address {}, and scan "
+ + "time {}. Check the exception for details. Exiting.",
+ fingerprintBase64, exitAddress, scanned, e);
System.exit(1);
}
}
/* Write parse history from memory to disk for the next execution. */
private static void writeImportHistoryToDisk() {
- File parseHistoryFile = new File("stats/exonerator-import-history");
- parseHistoryFile.getParentFile().mkdirs();
+ if (parseHistoryFile.getParentFile().mkdirs()) {
+ logger.debug("Created parent directory of parse history file {}.",
+ parseHistoryFile.getAbsoluteFile());
+ }
try (BufferedWriter bw = new BufferedWriter(new FileWriter(
parseHistoryFile))) {
for (Map.Entry<String, Long> historyEntry :
@@ -382,27 +493,43 @@ public class ExoneraTorDatabaseImporter {
+ historyEntry.getKey() + "\n");
}
} catch (IOException e) {
- logger.warn("File 'stats/exonerator-import-history' could "
- + "not be written. Ignoring.", e);
+ logger.warn("Caught an I/O exception while writing parse history file "
+ + "{}. The next execution might not be able to read this parse "
+ + "history and will parse all files in {}. Moving on, because there "
+ + "is nothing we can do about it.",
+ parseHistoryFile, importDirectory.getAbsoluteFile(), e);
}
+ logger.debug("Wrote parse history file {}.",
+ parseHistoryFile.getAbsoluteFile());
}
/* Close the database connection. */
private static void closeDatabaseConnection() {
try {
connection.close();
+ logger.debug("Disconnected from database.");
} catch (SQLException e) {
- logger.warn("Could not close database connection. Ignoring.", e);
+ logger.warn("Caught an SQL exception while disconnecting from the "
+ + "database. Check the exception for details and ideally log into "
+ + "the database manually to check that everything has been imported "
+ + "correctly. Ignoring, because we were going to terminate anyway.",
+ e);
}
}
/* Delete the exonerator-lock file to allow the next executing of this
* tool. */
private static void deleteLockFile() {
+ Path lockFile = Paths.get("exonerator-lock");
try {
- Files.delete(Paths.get("exonerator-lock"));
+ Files.delete(lockFile);
+ logger.debug("Deleted lock file {}.", lockFile);
} catch (IOException e) {
- logger.warn("Could not delete lock file \"exonerator-lock\"", e);
+ logger.warn("Caught an I/O exception while deleting lock file {}. This "
+ + "might prevent future executions from running until the lock file "
+ + "is 6 hours old and overwritten, provided that the file can be "
+ + "overwritten. Moving on, because we cannot do anything about it.",
+ lockFile, e);
}
}
}
More information about the tor-commits
mailing list