Author: mduerig
Date: Mon Apr 25 10:44:36 2016
New Revision: 1740798
URL: http://svn.apache.org/viewvc?rev=1740798&view=rev
Log:
OAK-2833: Refactor TarMK
Proper string interpolation in logging (instead of plain concatenation)
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentIdTable.java
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/BackgroundThread.java
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/TarReader.java
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentIdTable.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentIdTable.java?rev=1740798&r1=1740797&r2=1740798&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentIdTable.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/SegmentIdTable.java
Mon Apr 25 10:44:36 2016
@@ -154,8 +154,7 @@ public class SegmentIdTable {
// something is wrong, possibly a concurrency problem, a SegmentId
// hashcode or equals bug, or a problem with this hash table
// algorithm
- LOG.warn("Unexpected entry count mismatch, expected " +
- entryCount + " got " + ids.size());
+ LOG.warn("Unexpected entry count mismatch, expected {} got {}",
entryCount, ids.size());
// we fix the count, because having a wrong entry count would be
// very problematic; even worse than having a concurrency problem
entryCount = ids.size();
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/BackgroundThread.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/BackgroundThread.java?rev=1740798&r1=1740797&r2=1740798&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/BackgroundThread.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/BackgroundThread.java
Mon Apr 25 10:44:36 2016
@@ -97,7 +97,7 @@ class BackgroundThread extends Thread im
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
- log.error(name + " interrupted", e);
+ log.error("{} interrupted", name, e);
} catch (Error e) {
log.error("Unhandled error in background thread", e);
throw e;
@@ -118,7 +118,7 @@ class BackgroundThread extends Thread im
join();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
- log.error(name + " join interrupted", e);
+ log.error("{} join interrupted", name, e);
}
}
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java?rev=1740798&r1=1740797&r2=1740798&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/FileStore.java
Mon Apr 25 10:44:36 2016
@@ -507,8 +507,7 @@ public class FileStore implements Segmen
try {
flush();
} catch (IOException e) {
- log.warn("Failed to flush the TarMK at" +
- directory, e);
+ log.warn("Failed to flush the TarMK at {}",
directory, e);
}
}
});
@@ -1260,7 +1259,7 @@ public class FileStore implements Segmen
return new Segment(tracker, id, buffer);
}
} catch (IOException e) {
- log.warn("Failed to read from tar file " + reader, e);
+ log.warn("Failed to read from tar file {}", reader, e);
}
}
@@ -1273,7 +1272,7 @@ public class FileStore implements Segmen
return new Segment(tracker, id, buffer);
}
} catch (IOException e) {
- log.warn("Failed to read from tar file " + writer, e);
+ log.warn("Failed to read from tar file {}", writer, e);
}
} finally {
fileStoreLock.readLock().unlock();
@@ -1296,7 +1295,7 @@ public class FileStore implements Segmen
return new Segment(tracker, id, buffer);
}
} catch (IOException e) {
- log.warn("Failed to read from tar file " + reader, e);
+ log.warn("Failed to read from tar file {}", reader, e);
}
}
Modified:
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/TarReader.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/TarReader.java?rev=1740798&r1=1740797&r2=1740798&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/TarReader.java
(original)
+++
jackrabbit/oak/trunk/oak-segment-next/src/main/java/org/apache/jackrabbit/oak/segment/file/TarReader.java
Mon Apr 25 10:44:36 2016
@@ -192,7 +192,7 @@ class TarReader implements Closeable {
access.close();
}
} catch (IOException e) {
- log.warn("Could not read tar file " + file + ", skipping...", e);
+ log.warn("Could not read tar file {}, skipping...", file, e);
}
if (backup) {
@@ -209,7 +209,7 @@ class TarReader implements Closeable {
*/
private static void generateTarFile(LinkedHashMap<UUID, byte[]> entries,
File file) throws IOException {
- log.info("Regenerating tar file " + file);
+ log.info("Regenerating tar file {}", file);
TarWriter writer = new TarWriter(file);
for (Map.Entry<UUID, byte[]> entry : entries.entrySet()) {
UUID uuid = entry.getKey();
@@ -233,7 +233,7 @@ class TarReader implements Closeable {
*/
private static void backupSafely(File file) throws IOException {
File backup = findAvailGen(file, ".bak");
- log.info("Backing up " + file + " to " + backup.getName());
+ log.info("Backing up {} to {}", file, backup.getName());
if (!file.renameTo(backup)) {
log.warn("Renaming failed, so using copy to backup {}", file);
FileUtils.copyFile(file, backup);
@@ -288,19 +288,13 @@ class TarReader implements Closeable {
indexSize);
return new TarReader(file, mapped, index);
} catch (IOException e) {
- log.warn("Failed to mmap tar file " + name
- + ". Falling back to normal
file IO,"
- + " which will negatively
impact"
- + " repository performance.
This"
- + " problem may have been
caused by"
- + " restrictions on the
amount of"
- + " virtual memory available
to the"
- + " JVM. Please make sure
that a"
- + " 64-bit JVM is being used
and"
- + " that the process has
access to"
- + " unlimited virtual memory"
- + " (ulimit option -v).",
- e);
+ log.warn("Failed to mmap tar file {}. Falling
back to normal file " +
+ "IO, which will negatively impact
repository performance. " +
+ "This problem may have been caused by
restrictions on the " +
+ "amount of virtual memory available to
the JVM. Please make " +
+ "sure that a 64-bit JVM is being used
and that the process " +
+ "has access to unlimited virtual
memory (ulimit option -v).",
+ name, e);
}
}
@@ -316,7 +310,7 @@ class TarReader implements Closeable {
}
}
} catch (IOException e) {
- log.warn("Could not read tar file " + name + ", skipping...",
e);
+ log.warn("Could not read tar file {}, skipping...", name, e);
}
}
