You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2013/10/11 16:18:40 UTC
svn commit: r1531302 - in /zookeeper/bookkeeper/trunk: CHANGES.txt
bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java
Author: ivank
Date: Fri Oct 11 14:18:40 2013
New Revision: 1531302
URL: http://svn.apache.org/r1531302
Log:
BOOKKEEPER-638: Two bookies could start at the same time to access bookie data. (sijie via ivank)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1531302&r1=1531301&r2=1531302&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Fri Oct 11 14:18:40 2013
@@ -104,6 +104,8 @@ Trunk (unreleased changes)
BOOKKEEPER-675: Log noise fixup before cutting 4.2.2 (ivank)
+ BOOKKEEPER-638: Two bookies could start at the same time to access bookie data. (sijie via ivank)
+
hedwig-server:
BOOKKEEPER-601: readahead cache size isn't updated correctly (sijie via fpj)
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java?rev=1531302&r1=1531301&r2=1531302&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java Fri Oct 11 14:18:40 2013
@@ -20,12 +20,8 @@
*/
package org.apache.bookkeeper.proto;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
import java.io.IOException;
import java.net.InetSocketAddress;
-
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -33,23 +29,27 @@ import org.apache.bookkeeper.bookie.Book
import org.apache.bookkeeper.bookie.BookieException;
import org.apache.bookkeeper.conf.ServerConfiguration;
import org.apache.zookeeper.KeeperException;
-
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
+import org.jboss.netty.channel.ChannelStateEvent;
import org.jboss.netty.channel.Channels;
+import org.jboss.netty.channel.SimpleChannelHandler;
import org.jboss.netty.channel.group.ChannelGroup;
import org.jboss.netty.channel.group.ChannelGroupFuture;
import org.jboss.netty.channel.group.DefaultChannelGroup;
import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
import org.jboss.netty.handler.codec.frame.LengthFieldPrepender;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
/**
* Netty server for serving bookie requests
*/
@@ -65,8 +65,6 @@ class BookieNettyServer {
Object suspensionLock = new Object();
boolean suspended = false;
- final InetSocketAddress bindAddress;
-
BookieNettyServer(ServerConfiguration conf, Bookie bookie)
throws IOException, KeeperException, InterruptedException, BookieException {
this.conf = conf;
@@ -77,12 +75,14 @@ class BookieNettyServer {
serverChannelFactory = new NioServerSocketChannelFactory(
Executors.newCachedThreadPool(tfb.setNameFormat(base + "-boss-%d").build()),
Executors.newCachedThreadPool(tfb.setNameFormat(base + "-worker-%d").build()));
+ InetSocketAddress bindAddress;
if (conf.getListeningInterface() == null) {
// listen on all interfaces
bindAddress = new InetSocketAddress(conf.getBookiePort());
} else {
bindAddress = Bookie.getBookieAddress(conf);
}
+ listenOn(bindAddress);
}
boolean isRunning() {
@@ -106,15 +106,17 @@ class BookieNettyServer {
}
}
- void start() {
+ private void listenOn(InetSocketAddress address) {
ServerBootstrap bootstrap = new ServerBootstrap(serverChannelFactory);
bootstrap.setPipelineFactory(new BookiePipelineFactory());
bootstrap.setOption("child.tcpNoDelay", conf.getServerTcpNoDelay());
bootstrap.setOption("child.soLinger", 2);
- Channel listen = bootstrap.bind(bindAddress);
-
+ Channel listen = bootstrap.bind(address);
allChannels.add(listen);
+ }
+
+ void start() {
isRunning.set(true);
}
@@ -139,12 +141,22 @@ class BookieNettyServer {
pipeline.addLast("bookieProtoDecoder", new BookieProtoEncoding.RequestDecoder());
pipeline.addLast("bookieProtoEncoder", new BookieProtoEncoding.ResponseEncoder());
- pipeline.addLast("bookieRequestHandler", new BookieRequestHandler(conf, bookie,
- allChannels));
+ SimpleChannelHandler requestHandler = isRunning.get() ? new BookieRequestHandler(conf, bookie, allChannels)
+ : new RejectRequestHandler();
+ pipeline.addLast("bookieRequestHandler", requestHandler);
return pipeline;
}
}
+ private static class RejectRequestHandler extends SimpleChannelHandler {
+
+ @Override
+ public void channelOpen(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
+ ctx.getChannel().close();
+ }
+
+ }
+
private static class CleanupChannelGroup extends DefaultChannelGroup {
private AtomicBoolean closed = new AtomicBoolean(false);