提交 6755cad7 编写于 作者: wu-sheng's avatar wu-sheng 提交者: dongeforever

[ROCKETMQ-39] avoid duplicated codes closes apache/incubator-rocketmq#34

上级 ac832830
...@@ -22,7 +22,7 @@ import java.io.BufferedInputStream; ...@@ -22,7 +22,7 @@ import java.io.BufferedInputStream;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.InputStream; import java.io.InputStream;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.Callable;
import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option; import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options; import org.apache.commons.cli.Options;
...@@ -34,6 +34,7 @@ import org.apache.rocketmq.remoting.netty.NettyServerConfig; ...@@ -34,6 +34,7 @@ import org.apache.rocketmq.remoting.netty.NettyServerConfig;
import org.apache.rocketmq.remoting.netty.NettySystemConfig; import org.apache.rocketmq.remoting.netty.NettySystemConfig;
import org.apache.rocketmq.remoting.protocol.RemotingCommand; import org.apache.rocketmq.remoting.protocol.RemotingCommand;
import org.apache.rocketmq.srvutil.ServerUtil; import org.apache.rocketmq.srvutil.ServerUtil;
import org.apache.rocketmq.srvutil.ShutdownHookThread;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -135,24 +136,13 @@ public class FiltersrvStartup { ...@@ -135,24 +136,13 @@ public class FiltersrvStartup {
System.exit(-3); System.exit(-3);
} }
Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() { Runtime.getRuntime().addShutdownHook(new ShutdownHookThread(log, new Callable<Void>() {
private volatile boolean hasShutdown = false;
private AtomicInteger shutdownTimes = new AtomicInteger(0);
@Override @Override
public void run() { public Void call() throws Exception {
synchronized (this) { controller.shutdown();
log.info("shutdown hook was invoked, " + this.shutdownTimes.incrementAndGet()); return null;
if (!this.hasShutdown) {
this.hasShutdown = true;
long begineTime = System.currentTimeMillis();
controller.shutdown();
long consumingTimeTotal = System.currentTimeMillis() - begineTime;
log.info("shutdown hook over, consuming time total(ms): " + consumingTimeTotal);
}
}
} }
}, "ShutdownHook")); }));
return controller; return controller;
} catch (Throwable e) { } catch (Throwable e) {
......
...@@ -22,7 +22,7 @@ import java.io.BufferedInputStream; ...@@ -22,7 +22,7 @@ import java.io.BufferedInputStream;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.InputStream; import java.io.InputStream;
import java.util.Properties; import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.Callable;
import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option; import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options; import org.apache.commons.cli.Options;
...@@ -35,6 +35,7 @@ import org.apache.rocketmq.remoting.netty.NettyServerConfig; ...@@ -35,6 +35,7 @@ import org.apache.rocketmq.remoting.netty.NettyServerConfig;
import org.apache.rocketmq.remoting.netty.NettySystemConfig; import org.apache.rocketmq.remoting.netty.NettySystemConfig;
import org.apache.rocketmq.remoting.protocol.RemotingCommand; import org.apache.rocketmq.remoting.protocol.RemotingCommand;
import org.apache.rocketmq.srvutil.ServerUtil; import org.apache.rocketmq.srvutil.ServerUtil;
import org.apache.rocketmq.srvutil.ShutdownHookThread;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -61,9 +62,7 @@ public class NamesrvStartup { ...@@ -61,9 +62,7 @@ public class NamesrvStartup {
//PackageConflictDetect.detectFastjson(); //PackageConflictDetect.detectFastjson();
Options options = ServerUtil.buildCommandlineOptions(new Options()); Options options = ServerUtil.buildCommandlineOptions(new Options());
commandLine = commandLine = ServerUtil.parseCmdLine("mqnamesrv", args, buildCommandlineOptions(options), new PosixParser());
ServerUtil.parseCmdLine("mqnamesrv", args, buildCommandlineOptions(options),
new PosixParser());
if (null == commandLine) { if (null == commandLine) {
System.exit(-1); System.exit(-1);
return null; return null;
...@@ -97,8 +96,7 @@ public class NamesrvStartup { ...@@ -97,8 +96,7 @@ public class NamesrvStartup {
MixAll.properties2Object(ServerUtil.commandLine2Properties(commandLine), namesrvConfig); MixAll.properties2Object(ServerUtil.commandLine2Properties(commandLine), namesrvConfig);
if (null == namesrvConfig.getRocketmqHome()) { if (null == namesrvConfig.getRocketmqHome()) {
System.out.printf("Please set the " + MixAll.ROCKETMQ_HOME_ENV System.out.printf("Please set the " + MixAll.ROCKETMQ_HOME_ENV + " variable in your environment to match the location of the RocketMQ installation%n");
+ " variable in your environment to match the location of the RocketMQ installation%n");
System.exit(-2); System.exit(-2);
} }
...@@ -123,24 +121,13 @@ public class NamesrvStartup { ...@@ -123,24 +121,13 @@ public class NamesrvStartup {
System.exit(-3); System.exit(-3);
} }
Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() { Runtime.getRuntime().addShutdownHook(new ShutdownHookThread(log, new Callable<Void>() {
private volatile boolean hasShutdown = false;
private AtomicInteger shutdownTimes = new AtomicInteger(0);
@Override @Override
public void run() { public Void call() throws Exception {
synchronized (this) { controller.shutdown();
log.info("shutdown hook was invoked, " + this.shutdownTimes.incrementAndGet()); return null;
if (!this.hasShutdown) {
this.hasShutdown = true;
long begineTime = System.currentTimeMillis();
controller.shutdown();
long consumingTimeTotal = System.currentTimeMillis() - begineTime;
log.info("shutdown hook over, consuming time total(ms): " + consumingTimeTotal);
}
}
} }
}, "ShutdownHook")); }));
controller.start(); controller.start();
......
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.rocketmq.srvutil;
import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicInteger;
import org.slf4j.Logger;
/**
* {@link ShutdownHookThread} is the standard hook for filtersrv and namesrv modules.
* Through {@link Callable} interface, this hook can customization operations in anywhere.
*/
public class ShutdownHookThread extends Thread {
private volatile boolean hasShutdown = false;
private AtomicInteger shutdownTimes = new AtomicInteger(0);
private final Logger log;
private final Callable callback;
/**
* Create the standard hook thread, with a call back, by using {@link Callable} interface.
*
* @param log The log instance is used in hook thread.
* @param callback The call back function.
*/
public ShutdownHookThread(Logger log, Callable callback) {
super("ShutdownHook");
this.log = log;
this.callback = callback;
}
/**
* Thread run method.
* Invoke when the jvm shutdown.
* 1. count the invocation times.
* 2. execute the {@link ShutdownHookThread#callback}, and time it.
*/
@Override
public void run() {
synchronized (this) {
log.info("shutdown hook was invoked, " + this.shutdownTimes.incrementAndGet() + " times.");
if (!this.hasShutdown) {
this.hasShutdown = true;
long beginTime = System.currentTimeMillis();
try {
this.callback.call();
} catch (Exception e) {
log.error("shutdown hook callback invoked failure.", e);
}
long consumingTimeTotal = System.currentTimeMillis() - beginTime;
log.info("shutdown hook done, consuming time total(ms): " + consumingTimeTotal);
}
}
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册