You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2014/10/17 14:43:40 UTC
svn commit: r1632556 - in /jackrabbit/oak/branches/1.0: ./
oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/
oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/server/
oak-tarmk...
Author: alexparvulescu
Date: Fri Oct 17 12:43:40 2014
New Revision: 1632556
URL: http://svn.apache.org/r1632556
Log:
OAK-2150 TarMK cold standby: logs are too verbose
- merged r1628198
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/FailoverClientHandler.java
jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/SegmentLoaderHandler.java
jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/SegmentPreLoaderHandler.java
jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/server/FailoverServerHandler.java
jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/store/FailoverStore.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1628198
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/FailoverClientHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/FailoverClientHandler.java?rev=1632556&r1=1632555&r2=1632556&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/FailoverClientHandler.java (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/FailoverClientHandler.java Fri Oct 17 12:43:40 2014
@@ -80,7 +80,7 @@ public class FailoverClientHandler exten
if (store.getHead().getRecordId().equals(head)) {
// all sync'ed up
- log.info("no changes on sync.");
+ log.debug("no changes on sync.");
ctx.close();
return;
}
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/SegmentLoaderHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/SegmentLoaderHandler.java?rev=1632556&r1=1632555&r2=1632556&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/SegmentLoaderHandler.java (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/SegmentLoaderHandler.java Fri Oct 17 12:43:40 2014
@@ -86,7 +86,7 @@ public class SegmentLoaderHandler extend
}
private void initSync() {
- log.info("new head id " + head);
+ log.debug("new head id " + head);
long t = System.currentTimeMillis();
try {
@@ -110,7 +110,7 @@ public class SegmentLoaderHandler extend
throw e;
}
- log.info("did reread locally corrupt segment " + id + " with size " + s.size());
+ log.debug("did reread locally corrupt segment " + id + " with size " + s.size());
ByteArrayOutputStream bout = new ByteArrayOutputStream(s.size());
try {
s.writeTo(bout);
@@ -123,12 +123,11 @@ public class SegmentLoaderHandler extend
}
} while(true);
boolean ok = store.setHead(before, builder.getNodeState());
- log.info("#updated state (set head {}) in {}ms.", ok,
+ log.debug("updated head state successfully: {} in {}ms.", ok,
System.currentTimeMillis() - t);
} finally {
close();
}
- log.debug("returning initSync");
}
@Override
@@ -151,9 +150,9 @@ public class SegmentLoaderHandler extend
try {
for (;;) {
try {
- log.debug("polling segment");
+ // log.debug("polling segment");
Segment s = segment.poll(timeoutMs, TimeUnit.MILLISECONDS);
- log.debug("returning segment " + s);
+ // log.debug("returning segment " + s.getSegmentId());
return s;
} catch (InterruptedException ignore) {
interrupted = true;
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/SegmentPreLoaderHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/SegmentPreLoaderHandler.java?rev=1632556&r1=1632555&r2=1632556&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/SegmentPreLoaderHandler.java (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/SegmentPreLoaderHandler.java Fri Oct 17 12:43:40 2014
@@ -23,18 +23,13 @@ import io.netty.channel.SimpleChannelInb
import org.apache.jackrabbit.oak.plugins.segment.Segment;
import org.apache.jackrabbit.oak.plugins.segment.failover.codec.SegmentReply;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class SegmentPreLoaderHandler extends
SimpleChannelInboundHandler<Segment> {
- private static final Logger log = LoggerFactory
- .getLogger(SegmentPreLoaderHandler.class);
@Override
protected void channelRead0(ChannelHandlerContext ctx, Segment msg)
throws Exception {
- log.info("fire new segment reply for " + msg.getSegmentId());
ctx.fireUserEventTriggered(new SegmentReply(msg));
}
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/server/FailoverServerHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/server/FailoverServerHandler.java?rev=1632556&r1=1632555&r2=1632556&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/server/FailoverServerHandler.java (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/server/FailoverServerHandler.java Fri Oct 17 12:43:40 2014
@@ -141,7 +141,6 @@ public class FailoverServerHandler exten
RecordId r = headId();
if (r != null) {
ctx.writeAndFlush(r);
- log.debug("returning from head request");
return;
}
} else if (request.startsWith(Messages.GET_SEGMENT)) {
@@ -158,17 +157,16 @@ public class FailoverServerHandler exten
.getLeastSignificantBits()));
} catch (IllegalStateException e) {
// segment not found
- log.info("waiting for segment. Got exception: " + e.getMessage());
+ log.debug("waiting for segment. Got exception: " + e.getMessage());
TimeUnit.MILLISECONDS.sleep(1000);
}
if (s != null) break;
}
if (s != null) {
- log.info("sending segment" + sid + " to " + client);
+ log.debug("sending segment " + sid + " to " + client);
ctx.writeAndFlush(s);
observer.didSendSegmentBytes(clientID, s.size());
- log.debug("master returns from segment request");
return;
}
} else {
Modified: jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/store/FailoverStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/store/FailoverStore.java?rev=1632556&r1=1632555&r2=1632556&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/store/FailoverStore.java (original)
+++ jackrabbit/oak/branches/1.0/oak-tarmk-failover/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/store/FailoverStore.java Fri Oct 17 12:43:40 2014
@@ -68,7 +68,6 @@ public class FailoverStore implements Se
@Override
public Segment readSegment(SegmentId sid) {
- log.info("shall read segment " + sid);
Deque<SegmentId> ids = new ArrayDeque<SegmentId>();
ids.offer(sid);
int err = 0;
@@ -80,7 +79,7 @@ public class FailoverStore implements Se
log.debug("trying to read segment " + id);
Segment s = loader.readSegment(id.toString());
if (s != null) {
- log.info("got segment " + id + " with size " + s.size());
+ log.debug("got segment " + id + " with size " + s.size());
ByteArrayOutputStream bout = new ByteArrayOutputStream(
s.size());
if (id.isDataSegmentId()) {
@@ -111,7 +110,7 @@ public class FailoverStore implements Se
}
}
- log.info("calling delegate to return segment " + sid);
+ log.debug("calling delegate to return segment " + sid);
return delegate.readSegment(sid);
}