leveldb store: Add more log traces for when we need to get more details on what's going on.
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f2e58dc8 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f2e58dc8 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f2e58dc8 Branch: refs/heads/activemq-5.9 Commit: f2e58dc87f2fc7b9c67d842037abf9857224164e Parents: ca02709 Author: Hiram Chirino <[email protected]> Authored: Fri Nov 1 14:24:36 2013 -0400 Committer: Hadrian Zbarcea <[email protected]> Committed: Wed Mar 12 09:00:25 2014 -0400 ---------------------------------------------------------------------- .../scala/org/apache/activemq/leveldb/LevelDBClient.scala | 4 ++-- .../main/scala/org/apache/activemq/leveldb/RecordLog.scala | 2 +- .../activemq/leveldb/replicated/MasterLevelDBStore.scala | 2 ++ .../activemq/leveldb/replicated/SlaveLevelDBStore.scala | 8 ++++++-- activemq-leveldb-store/src/test/resources/log4j.properties | 2 +- 5 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/f2e58dc8/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala index b130a22..1a0dd35 100755 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/LevelDBClient.scala @@ -602,7 +602,7 @@ class LevelDBClient(store: LevelDBStore) { Some(this.getClass.getClassLoader.loadClass(name).newInstance().asInstanceOf[DBFactory]) } catch { case e:Throwable => - debug(e, "Could not load factory: "+name+" due to: "+e) + debug("Could not load factory: "+name+" due to: "+e) None } }.headOption.getOrElse(throw new Exception("Could not load any of the index factory classes: "+factoryNames)) @@ -822,7 +822,7 @@ class LevelDBClient(store: LevelDBStore) { throw e; } finally { recoveryLogs = null - debug("Replay of journal done") + debug("Replay end") } } } http://git-wip-us.apache.org/repos/asf/activemq/blob/f2e58dc8/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala index e69b58a..28e1be1 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/RecordLog.scala @@ -313,7 +313,7 @@ case class RecordLog(directory: File, logSuffix:String) { val prefix = is.readByte() if( prefix != LOG_HEADER_PREFIX ) { // Does not look like a record. - throw new IOException("invalid record position %d (file: %s, offset: %d)".format(record_position, file.getName, offset)) + throw new IOException("invalid record position %d (file: %s, offset: %d)".format(record_position, file.getAbsolutePath, offset)) } val id = is.readByte() val expectedChecksum = is.readInt() http://git-wip-us.apache.org/repos/asf/activemq/blob/f2e58dc8/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala index f50e556..0381627 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/MasterLevelDBStore.scala @@ -236,6 +236,7 @@ class MasterLevelDBStore extends LevelDBStore with ReplicatedLevelDBStoreTrait { if( login == null || slave_state == null) { return; } + trace("%s: Got WAL ack, position: %d, from: %s", directory, req.position, slave_state.slave_id) slave_state.position_update(req.position) } @@ -398,6 +399,7 @@ class MasterLevelDBStore extends LevelDBStore with ReplicatedLevelDBStoreTrait { value.date = date wal_date = value.date; value.sync = (syncToMask & SYNC_TO_REMOTE_DISK)!=0 + trace("%s: Sending WAL update: (file:%d, offset: %d, length: %d)", directory, value.file, value.offset, value.length) val frame1 = ReplicationFrame(WAL_ACTION, JsonCodec.encode(value)) val frame2 = FileTransferFrame(file, offset, length) for( slave <- slaves.values() ) { http://git-wip-us.apache.org/repos/asf/activemq/blob/f2e58dc8/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala index 7befe9d..07ef0ee 100644 --- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala +++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/SlaveLevelDBStore.scala @@ -178,14 +178,15 @@ class SlaveLevelDBStore extends LevelDBStore with ReplicatedLevelDBStoreTrait { if( caughtUp && value.offset ==0 && value.file!=0 ) { client.log.rotate } + trace("%s, Slave WAL update: (file:%s, offset: %d, length: %d)".format(directory, value.file.toHexString, value.offset, value.length)) val file = client.log.next_log(value.file) val buffer = map(file, value.offset, value.length, false) session.codec.readData(buffer, ^{ if( value.sync ) { buffer.force() } + unmap(buffer) -// info("Slave WAL update: %s, (offset: %d, length: %d), sending ack:%s", file, value.offset, value.length, caughtUp) wal_append_offset = value.offset+value.length wal_append_position = value.file + wal_append_offset wal_date = value.date @@ -296,7 +297,7 @@ class SlaveLevelDBStore extends LevelDBStore with ReplicatedLevelDBStoreTrait { transport.setDispatchQueue(queue) transport.connecting(new URI(connect), null) - debug("Connecting download session.") + debug("%s: Connecting download session. Snapshot index at: %s".format(directory, state.snapshot_position.toHexString)) transfer_session = new Session(transport, (session)=> { var total_files = 0 @@ -360,6 +361,7 @@ class SlaveLevelDBStore extends LevelDBStore with ReplicatedLevelDBStoreTrait { val buffer = map(target_file, 0, x.length, false) session.codec.readData(buffer, ^{ unmap(buffer) + trace("%s, Downloaded %s, offset:%d, length:%d", directory, transfer.file, transfer.offset, transfer.length) downloaded_size += x.length downloaded_files += 1 update_download_status @@ -384,6 +386,7 @@ class SlaveLevelDBStore extends LevelDBStore with ReplicatedLevelDBStoreTrait { val buffer = map(dirty_index / x.file, 0, x.length, false) session.codec.readData(buffer, ^{ unmap(buffer) + trace("%s, Downloaded %s, offset:%d, length:%d", directory, transfer.file, transfer.offset, transfer.length) downloaded_size += x.length downloaded_files += 1 update_download_status @@ -405,6 +408,7 @@ class SlaveLevelDBStore extends LevelDBStore with ReplicatedLevelDBStoreTrait { } client.writeExecutor { if( !state.index_files.isEmpty ) { + trace("%s: Index sync complete, copying to snapshot.", directory) client.copyDirtyIndexToSnapshot(state.wal_append_position) } client.replay_init() http://git-wip-us.apache.org/repos/asf/activemq/blob/f2e58dc8/activemq-leveldb-store/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/src/test/resources/log4j.properties b/activemq-leveldb-store/src/test/resources/log4j.properties index fd5a31b..da0480a 100755 --- a/activemq-leveldb-store/src/test/resources/log4j.properties +++ b/activemq-leveldb-store/src/test/resources/log4j.properties @@ -20,7 +20,7 @@ # log4j.rootLogger=WARN, console, file log4j.logger.org.apache.activemq=INFO -log4j.logger.org.fusesource=INFO +log4j.logger.org.apache.activemq.leveldb=INFO # Console will only display warnnings log4j.appender.console=org.apache.log4j.ConsoleAppender
