From 7d986dadaf648641fd04fbd6be25d7705bf0973a Mon Sep 17 00:00:00 2001 From: shtykh_roman Date: Thu, 22 Dec 2016 17:27:51 +0900 Subject: [PATCH 1/5] Logging instead of printStack(). Fix for ROCKETMQ-6. --- .../rocketmq/broker/BrokerController.java | 2 +- .../alibaba/rocketmq/common/BrokerConfig.java | 8 +++- .../com/alibaba/rocketmq/common/MixAll.java | 39 ++++++++----------- .../rocketmq/common/ServiceThread.java | 4 +- .../common/protocol/MQProtosHelper.java | 19 ++++----- .../ClusterTestRequestProcessor.java | 2 +- .../remoting/common/RemotingHelper.java | 7 +++- .../remoting/common/RemotingUtil.java | 8 +--- .../remoting/common/ServiceThread.java | 14 +++---- .../store/AllocateMappedFileService.java | 2 +- .../com/alibaba/rocketmq/store/CommitLog.java | 2 +- .../alibaba/rocketmq/store/ConsumeQueue.java | 3 +- .../alibaba/rocketmq/store/MappedFile.java | 2 +- .../rocketmq/store/StoreCheckpoint.java | 2 +- .../rocketmq/store/ha/WaitNotifyObject.java | 9 +++-- .../rocketmq/store/index/IndexFile.java | 4 +- .../rocketmq/store/index/IndexService.java | 2 +- 17 files changed, 62 insertions(+), 67 deletions(-) diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/BrokerController.java b/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/BrokerController.java index b2b6aedefd3..9c9781834b2 100644 --- a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/BrokerController.java +++ b/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/BrokerController.java @@ -191,7 +191,7 @@ public boolean initialize() throws CloneNotSupportedException { this.messageStore = MessageStoreFactory.build(context, this.messageStore); } catch (IOException e) { result = false; - e.printStackTrace(); + log.error("Failed to initialize", e); } } diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/BrokerConfig.java b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/BrokerConfig.java index 6eae0a74295..a3a4855af2c 100644 --- a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/BrokerConfig.java +++ b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/BrokerConfig.java @@ -17,17 +17,21 @@ package com.alibaba.rocketmq.common; import com.alibaba.rocketmq.common.annotation.ImportantField; +import com.alibaba.rocketmq.common.constant.LoggerName; import com.alibaba.rocketmq.common.constant.PermName; import com.alibaba.rocketmq.remoting.common.RemotingUtil; import java.net.InetAddress; import java.net.UnknownHostException; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author shijia.wxr */ public class BrokerConfig { + private static final Logger log = LoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME); + private String rocketmqHome = System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY, System.getenv(MixAll.ROCKETMQ_HOME_ENV)); @ImportantField private String namesrvAddr = System.getProperty(MixAll.NAMESRV_ADDR_PROPERTY, System.getenv(MixAll.NAMESRV_ADDR_ENV)); @@ -156,7 +160,7 @@ public static String localHostName() { try { return InetAddress.getLocalHost().getHostName(); } catch (UnknownHostException e) { - e.printStackTrace(); + log.error("Failed to obtain the host name", e); } return "DEFAULT_BROKER"; diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/MixAll.java b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/MixAll.java index 508111cabe7..dbb7067eeef 100644 --- a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/MixAll.java +++ b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/MixAll.java @@ -17,6 +17,7 @@ package com.alibaba.rocketmq.common; import com.alibaba.rocketmq.common.annotation.ImportantField; +import com.alibaba.rocketmq.common.constant.LoggerName; import com.alibaba.rocketmq.common.help.FAQUrl; import org.slf4j.Logger; @@ -26,7 +27,6 @@ import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; -import java.io.UnsupportedEncodingException; import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -46,12 +46,14 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.atomic.AtomicLong; - +import org.slf4j.LoggerFactory; /** * @author shijia.wxr */ public class MixAll { + private static final Logger log = LoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME); + public static final String ROCKETMQ_HOME_ENV = "ROCKETMQ_HOME"; public static final String ROCKETMQ_HOME_PROPERTY = "rocketmq.home.dir"; public static final String NAMESRV_ADDR_ENV = "NAMESRV_ADDR"; @@ -209,13 +211,13 @@ public static final String file2String(final File file) { int len = fileReader.read(data); result = len == data.length; } catch (IOException e) { - // e.printStackTrace(); + log.error("Failed to read data", e); } finally { if (fileReader != null) { try { fileReader.close(); } catch (IOException e) { - e.printStackTrace(); + log.error("Failed to close", e); } } } @@ -256,12 +258,12 @@ public static String findClassPath(Class c) { } - public static void printObjectProperties(final Logger log, final Object object) { - printObjectProperties(log, object, false); + public static void printObjectProperties(final Logger logger, final Object object) { + printObjectProperties(logger, object, false); } - public static void printObjectProperties(final Logger log, final Object object, final boolean onlyImportantField) { + public static void printObjectProperties(final Logger logger, final Object object, final boolean onlyImportantField) { Field[] fields = object.getClass().getDeclaredFields(); for (Field field : fields) { if (!Modifier.isStatic(field.getModifiers())) { @@ -274,10 +276,8 @@ public static void printObjectProperties(final Logger log, final Object object, if (null == value) { value = ""; } - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); + } catch (Exception e) { + log.error("Failed to obtain object properties", e); } if (onlyImportantField) { @@ -287,8 +287,8 @@ public static void printObjectProperties(final Logger log, final Object object, } } - if (log != null) { - log.info(name + "=" + value); + if (logger != null) { + logger.info(name + "=" + value); } else { } } @@ -312,11 +312,8 @@ public static Properties string2Properties(final String str) { try { InputStream in = new ByteArrayInputStream(str.getBytes(DEFAULT_CHARSET)); properties.load(in); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - return null; - } catch (IOException e) { - e.printStackTrace(); + } catch (Exception e) { + log.error("Failed to handle properties", e); return null; } @@ -335,10 +332,8 @@ public static Properties object2Properties(final Object object) { try { field.setAccessible(true); value = field.get(object); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); + } catch (Exception e) { + log.error("Failed to handle properties", e); } if (value != null) { diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ServiceThread.java b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ServiceThread.java index d6da0e361c2..a84288c1444 100644 --- a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ServiceThread.java +++ b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ServiceThread.java @@ -78,7 +78,7 @@ public void shutdown(final boolean interrupt) { STLOG.info("join thread " + this.getServiceName() + " eclipse time(ms) " + eclipseTime + " " + this.getJointime()); } catch (InterruptedException e) { - e.printStackTrace(); + STLOG.error("Interrupted", e); } } @@ -126,7 +126,7 @@ protected void waitForRunning(long interval) { try { waitPoint.await(interval, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { - e.printStackTrace(); + STLOG.error("Interrupted", e); } finally { hasNotified.set(false); this.onWaitEnd(); diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/MQProtosHelper.java b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/MQProtosHelper.java index aaaa51da2f6..bef28f58f6e 100644 --- a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/MQProtosHelper.java +++ b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/protocol/MQProtosHelper.java @@ -17,18 +17,19 @@ package com.alibaba.rocketmq.common.protocol; +import com.alibaba.rocketmq.common.constant.LoggerName; import com.alibaba.rocketmq.common.protocol.header.namesrv.RegisterBrokerRequestHeader; import com.alibaba.rocketmq.remoting.common.RemotingHelper; -import com.alibaba.rocketmq.remoting.exception.RemotingConnectException; -import com.alibaba.rocketmq.remoting.exception.RemotingSendRequestException; -import com.alibaba.rocketmq.remoting.exception.RemotingTimeoutException; import com.alibaba.rocketmq.remoting.protocol.RemotingCommand; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author shijia.wxr */ public class MQProtosHelper { + private static final Logger log = LoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME); + public static boolean registerBrokerToNameServer(final String nsaddr, final String brokerAddr, final long timeoutMillis) { RegisterBrokerRequestHeader requestHeader = new RegisterBrokerRequestHeader(); @@ -42,14 +43,8 @@ public static boolean registerBrokerToNameServer(final String nsaddr, final Stri if (response != null) { return ResponseCode.SUCCESS == response.getCode(); } - } catch (RemotingConnectException e) { - e.printStackTrace(); - } catch (RemotingSendRequestException e) { - e.printStackTrace(); - } catch (RemotingTimeoutException e) { - e.printStackTrace(); - } catch (InterruptedException e) { - e.printStackTrace(); + } catch (Exception e) { + log.error("Failed to register broker", e); } return false; diff --git a/rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/processor/ClusterTestRequestProcessor.java b/rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/processor/ClusterTestRequestProcessor.java index b0b158d7235..3979537355f 100644 --- a/rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/processor/ClusterTestRequestProcessor.java +++ b/rocketmq-namesrv/src/main/java/com/alibaba/rocketmq/namesrv/processor/ClusterTestRequestProcessor.java @@ -50,7 +50,7 @@ public ClusterTestRequestProcessor(NamesrvController namesrvController, String p try { adminExt.start(); } catch (MQClientException e) { - e.printStackTrace(); + log.error("Failed to start processor", e); } } diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingHelper.java b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingHelper.java index 9dcdd838646..6cf49204305 100644 --- a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingHelper.java +++ b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingHelper.java @@ -27,7 +27,8 @@ import java.net.SocketAddress; import java.nio.ByteBuffer; import java.nio.channels.SocketChannel; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author shijia.wxr @@ -36,6 +37,8 @@ public class RemotingHelper { public static final String ROCKETMQ_REMOTING = "RocketmqRemoting"; public static final String DEFAULT_CHARSET = "UTF-8"; + private static final Logger log = LoggerFactory.getLogger(ROCKETMQ_REMOTING); + public static String exceptionSimpleDesc(final Throwable e) { StringBuffer sb = new StringBuffer(); if (e != null) { @@ -136,7 +139,7 @@ public static RemotingCommand invokeSync(final String addr, final RemotingComman byteBufferBody.flip(); return RemotingCommand.decode(byteBufferBody); } catch (IOException e) { - e.printStackTrace(); + log.error("invokeSync failure", e); if (sendRequestOK) { throw new RemotingTimeoutException(addr, timeoutMillis); diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingUtil.java b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingUtil.java index af2348f9d12..363bee00384 100644 --- a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingUtil.java +++ b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/RemotingUtil.java @@ -29,8 +29,6 @@ import java.net.InetSocketAddress; import java.net.NetworkInterface; import java.net.SocketAddress; -import java.net.SocketException; -import java.net.UnknownHostException; import java.nio.channels.Selector; import java.nio.channels.SocketChannel; import java.nio.channels.spi.SelectorProvider; @@ -135,10 +133,8 @@ public static String getLocalAddress() { //If failed to find,fall back to localhost final InetAddress localHost = InetAddress.getLocalHost(); return normalizeHostAddress(localHost); - } catch (SocketException e) { - e.printStackTrace(); - } catch (UnknownHostException e) { - e.printStackTrace(); + } catch (Exception e) { + log.error("Failed to obtain local address", e); } return null; diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/ServiceThread.java b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/ServiceThread.java index 365c670e3b8..f98ec373280 100644 --- a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/ServiceThread.java +++ b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/ServiceThread.java @@ -27,7 +27,7 @@ * */ public abstract class ServiceThread implements Runnable { - private static final Logger STLOG = LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING); + private static final Logger log = LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING); private static final long JOIN_TIME = 90 * 1000; protected final Thread thread; protected volatile boolean hasNotified = false; @@ -53,7 +53,7 @@ public void shutdown() { public void shutdown(final boolean interrupt) { this.stopped = true; - STLOG.info("shutdown thread " + this.getServiceName() + " interrupt " + interrupt); + log.info("shutdown thread " + this.getServiceName() + " interrupt " + interrupt); synchronized (this) { if (!this.hasNotified) { this.hasNotified = true; @@ -69,10 +69,10 @@ public void shutdown(final boolean interrupt) { long beginTime = System.currentTimeMillis(); this.thread.join(this.getJointime()); long eclipseTime = System.currentTimeMillis() - beginTime; - STLOG.info("join thread " + this.getServiceName() + " eclipse time(ms) " + eclipseTime + " " + log.info("join thread " + this.getServiceName() + " eclipse time(ms) " + eclipseTime + " " + this.getJointime()); } catch (InterruptedException e) { - e.printStackTrace(); + log.error("Interrupted", e); } } @@ -86,7 +86,7 @@ public void stop() { public void stop(final boolean interrupt) { this.stopped = true; - STLOG.info("stop thread " + this.getServiceName() + " interrupt " + interrupt); + log.info("stop thread " + this.getServiceName() + " interrupt " + interrupt); synchronized (this) { if (!this.hasNotified) { this.hasNotified = true; @@ -101,7 +101,7 @@ public void stop(final boolean interrupt) { public void makeStop() { this.stopped = true; - STLOG.info("makestop thread " + this.getServiceName()); + log.info("makestop thread " + this.getServiceName()); } public void wakeup() { @@ -124,7 +124,7 @@ protected void waitForRunning(long interval) { try { this.wait(interval); } catch (InterruptedException e) { - e.printStackTrace(); + log.error("Interrupted", e); } finally { this.hasNotified = false; this.onWaitEnd(); diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/AllocateMappedFileService.java b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/AllocateMappedFileService.java index 40eee7a6603..3e264130fce 100644 --- a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/AllocateMappedFileService.java +++ b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/AllocateMappedFileService.java @@ -134,7 +134,7 @@ public void shutdown() { try { this.thread.join(this.getJointime()); } catch (InterruptedException e) { - e.printStackTrace(); + log.error("Interrupted", e); } for (AllocateRequest req : this.requestTable.values()) { diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/CommitLog.java b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/CommitLog.java index 23f305d22f8..b8d376ceadf 100644 --- a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/CommitLog.java +++ b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/CommitLog.java @@ -968,7 +968,7 @@ public boolean waitForFlush(long timeout) { this.countDownLatch.await(timeout, TimeUnit.MILLISECONDS); return this.flushOK; } catch (InterruptedException e) { - e.printStackTrace(); + log.error("Interrupted", e); return false; } } diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ConsumeQueue.java b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ConsumeQueue.java index f23eb1c4494..f7f83060cf2 100644 --- a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ConsumeQueue.java +++ b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ConsumeQueue.java @@ -316,7 +316,6 @@ public void correctMinOffset(long phyMinOffset) { SelectMappedBufferResult result = mappedFile.selectMappedBuffer(0); if (result != null) { try { - for (int i = 0; i < result.getSize(); i += ConsumeQueue.CQ_STORE_UNIT_SIZE) { long offsetPy = result.getByteBuffer().getLong(); result.getByteBuffer().getInt(); @@ -330,7 +329,7 @@ public void correctMinOffset(long phyMinOffset) { } } } catch (Exception e) { - e.printStackTrace(); + log.warn("Failed to correctMinOffset", e); } finally { result.release(); } diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MappedFile.java b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MappedFile.java index ed2afa905ff..e301e79d092 100644 --- a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MappedFile.java +++ b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/MappedFile.java @@ -516,7 +516,7 @@ public void warmMappedFile(FlushDiskType type, int pages) { try { Thread.sleep(0); } catch (InterruptedException e) { - e.printStackTrace(); + log.error("Interrupted", e); } } } diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/StoreCheckpoint.java b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/StoreCheckpoint.java index 2d75fd5f4ad..04ef2a1dd54 100644 --- a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/StoreCheckpoint.java +++ b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/StoreCheckpoint.java @@ -78,7 +78,7 @@ public void shutdown() { try { this.fileChannel.close(); } catch (IOException e) { - e.printStackTrace(); + log.error("Failed to properly close the channel", e); } } diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ha/WaitNotifyObject.java b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ha/WaitNotifyObject.java index f540cdb9142..f91217aa184 100644 --- a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ha/WaitNotifyObject.java +++ b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ha/WaitNotifyObject.java @@ -16,13 +16,16 @@ */ package com.alibaba.rocketmq.store.ha; +import com.alibaba.rocketmq.common.constant.LoggerName; import java.util.HashMap; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author shijia.wxr */ public class WaitNotifyObject { + private static final Logger log = LoggerFactory.getLogger(LoggerName.STORE_LOGGER_NAME); protected final HashMap waitingThreadTable = new HashMap(16); @@ -51,7 +54,7 @@ protected void waitForRunning(long interval) { try { this.wait(interval); } catch (InterruptedException e) { - e.printStackTrace(); + log.error("Interrupted", e); } finally { this.hasNotified = false; this.onWaitEnd(); @@ -91,7 +94,7 @@ public void allWaitForRunning(long interval) { try { this.wait(interval); } catch (InterruptedException e) { - e.printStackTrace(); + log.error("Interrupted", e); } finally { this.waitingThreadTable.put(currentThreadId, false); this.onWaitEnd(); diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexFile.java b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexFile.java index f35332014eb..27a71c96de2 100644 --- a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexFile.java +++ b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexFile.java @@ -162,7 +162,7 @@ public boolean putKey(final String key, final long phyOffset, final long storeTi try { fileLock.release(); } catch (IOException e) { - e.printStackTrace(); + log.error("Failed to release the lock", e); } } } @@ -279,7 +279,7 @@ public void selectPhyOffset(final List phyOffsets, final String key, final try { fileLock.release(); } catch (IOException e) { - e.printStackTrace(); + log.error("Failed to release the lock", e); } } diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexService.java b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexService.java index f275f80875d..917b1b1cbdb 100644 --- a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexService.java +++ b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/index/IndexService.java @@ -287,7 +287,7 @@ public IndexFile retryGetAndCreateIndexFile() { log.error("try to create index file, " + times + " times"); Thread.sleep(1000); } catch (InterruptedException e) { - e.printStackTrace(); + log.error("Interrupted", e); } } From b13daaa16edad82618afc6545ab6bac1e96a1d41 Mon Sep 17 00:00:00 2001 From: shtykh_roman Date: Thu, 22 Dec 2016 17:41:08 +0900 Subject: [PATCH 2/5] catch clause without logs --- .../main/java/com/alibaba/rocketmq/common/UtilAll.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/UtilAll.java b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/UtilAll.java index 4429e3d4105..d8b24afc3e3 100644 --- a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/UtilAll.java +++ b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/UtilAll.java @@ -16,6 +16,7 @@ */ package com.alibaba.rocketmq.common; +import com.alibaba.rocketmq.common.constant.LoggerName; import com.alibaba.rocketmq.remoting.common.RemotingHelper; import java.io.ByteArrayInputStream; @@ -34,12 +35,15 @@ import java.util.zip.CRC32; import java.util.zip.DeflaterOutputStream; import java.util.zip.InflaterInputStream; - +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author shijia.wxr */ public class UtilAll { + private static final Logger log = LoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME); + public static final String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"; public static final String YYYY_MM_DD_HH_MM_SS_SSS = "yyyy-MM-dd#HH:mm:ss:SSS"; public static final String YYYY_MMDD_HHMMSS = "yyyyMMddHHmmss"; @@ -285,14 +289,17 @@ public static byte[] uncompress(final byte[] src) throws IOException { try { byteArrayInputStream.close(); } catch (IOException e) { + log.error("Failed to close the stream", e); } try { inflaterInputStream.close(); } catch (IOException e) { + log.error("Failed to close the stream", e); } try { byteArrayOutputStream.close(); } catch (IOException e) { + log.error("Failed to close the stream", e); } } From 8ec82dcbf7b72222d1b5d5bc64fdb705dff490d6 Mon Sep 17 00:00:00 2001 From: shtykh_roman Date: Thu, 22 Dec 2016 17:53:07 +0900 Subject: [PATCH 3/5] Unified Logger name. --- .../processor/PullMessageProcessor.java | 48 ++++++++-------- .../broker/topic/TopicConfigManager.java | 34 ++++++----- .../rocketmq/common/ConfigManager.java | 13 ++--- .../rocketmq/common/ServiceThread.java | 15 ++--- .../com/alibaba/rocketmq/common/UtilAll.java | 1 - .../common/namesrv/NamesrvConfig.java | 2 +- .../common/namesrv/TopAddressing.java | 2 +- .../rocketmq/filtersrv/filter/DynaCode.java | 8 +-- .../remoting/common/ServiceThread.java | 4 +- .../rocketmq/remoting/netty/NettyDecoder.java | 1 + .../remoting/netty/NettyRemotingAbstract.java | 57 +++++++++---------- .../alibaba/rocketmq/store/ConsumeQueue.java | 2 +- .../schedule/ScheduleMessageService.java | 3 +- .../rocketmq/store/stats/BrokerStats.java | 1 + 14 files changed, 93 insertions(+), 98 deletions(-) diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/PullMessageProcessor.java b/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/PullMessageProcessor.java index 0152b93a812..58549478d70 100644 --- a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/PullMessageProcessor.java +++ b/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/processor/PullMessageProcessor.java @@ -61,7 +61,7 @@ * @author shijia.wxr */ public class PullMessageProcessor implements NettyRequestProcessor { - private static final Logger LOG = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME); + private static final Logger log = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME); private final BrokerController brokerController; private List consumeMessageHookList; @@ -89,8 +89,8 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re response.setOpaque(request.getOpaque()); - if (LOG.isDebugEnabled()) { - LOG.debug("receive PullMessage request command, " + request); + if (log.isDebugEnabled()) { + log.debug("receive PullMessage request command, " + request); } @@ -126,7 +126,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re TopicConfig topicConfig = this.brokerController.getTopicConfigManager().selectTopicConfig(requestHeader.getTopic()); if (null == topicConfig) { - LOG.error("the topic " + requestHeader.getTopic() + " not exist, consumer: " + RemotingHelper.parseChannelRemoteAddr(channel)); + log.error("the topic " + requestHeader.getTopic() + " not exist, consumer: " + RemotingHelper.parseChannelRemoteAddr(channel)); response.setCode(ResponseCode.TOPIC_NOT_EXIST); response.setRemark( "topic[" + requestHeader.getTopic() + "] not exist, apply first please!" + FAQUrl.suggestTodo(FAQUrl.APPLY_TOPIC_URL)); @@ -144,7 +144,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re if (requestHeader.getQueueId() < 0 || requestHeader.getQueueId() >= topicConfig.getReadQueueNums()) { String errorInfo = "queueId[" + requestHeader.getQueueId() + "] is illagal,Topic :" + requestHeader.getTopic() + " topicConfig.readQueueNums: " + topicConfig.getReadQueueNums() + " consumer: " + channel.remoteAddress(); - LOG.warn(errorInfo); + log.warn(errorInfo); response.setCode(ResponseCode.SYSTEM_ERROR); response.setRemark(errorInfo); return response; @@ -157,7 +157,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re subscriptionData = FilterAPI.buildSubscriptionData(requestHeader.getConsumerGroup(), requestHeader.getTopic(), requestHeader.getSubscription()); } catch (Exception e) { - LOG.warn("parse the consumer's subscription[{}] failed, group: {}", requestHeader.getSubscription(), // + log.warn("parse the consumer's subscription[{}] failed, group: {}", requestHeader.getSubscription(), // requestHeader.getConsumerGroup()); response.setCode(ResponseCode.SUBSCRIPTION_PARSE_FAILED); response.setRemark("parse the consumer's subscription failed"); @@ -167,7 +167,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re ConsumerGroupInfo consumerGroupInfo = this.brokerController.getConsumerManager().getConsumerGroupInfo(requestHeader.getConsumerGroup()); if (null == consumerGroupInfo) { - LOG.warn("the consumer's group info not exist, group: {}", requestHeader.getConsumerGroup()); + log.warn("the consumer's group info not exist, group: {}", requestHeader.getConsumerGroup()); response.setCode(ResponseCode.SUBSCRIPTION_NOT_EXIST); response.setRemark("the consumer's group info not exist" + FAQUrl.suggestTodo(FAQUrl.SAME_GROUP_DIFFERENT_TOPIC)); return response; @@ -182,7 +182,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re subscriptionData = consumerGroupInfo.findSubscriptionData(requestHeader.getTopic()); if (null == subscriptionData) { - LOG.warn("the consumer's subscription not exist, group: {}, topic:{}", requestHeader.getConsumerGroup(), requestHeader.getTopic()); + log.warn("the consumer's subscription not exist, group: {}, topic:{}", requestHeader.getConsumerGroup(), requestHeader.getTopic()); response.setCode(ResponseCode.SUBSCRIPTION_NOT_EXIST); response.setRemark("the consumer's subscription not exist" + FAQUrl.suggestTodo(FAQUrl.SAME_GROUP_DIFFERENT_TOPIC)); return response; @@ -190,7 +190,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re if (subscriptionData.getSubVersion() < requestHeader.getSubVersion()) { - LOG.warn("the broker's subscription is not latest, group: {} {}", requestHeader.getConsumerGroup(), + log.warn("the broker's subscription is not latest, group: {} {}", requestHeader.getConsumerGroup(), subscriptionData.getSubString()); response.setCode(ResponseCode.SUBSCRIPTION_NOT_LATEST); response.setRemark("the consumer's subscription not latest"); @@ -252,7 +252,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re response.setCode(ResponseCode.PULL_OFFSET_MOVED); // XXX: warn and notify me - LOG.info("the broker store no queue data, fix the request offset {} to {}, Topic: {} QueueId: {} Consumer Group: {}", // + log.info("the broker store no queue data, fix the request offset {} to {}, Topic: {} QueueId: {} Consumer Group: {}", // requestHeader.getQueueOffset(), // getMessageResult.getNextBeginOffset(), // requestHeader.getTopic(), // @@ -272,7 +272,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re case OFFSET_OVERFLOW_BADLY: response.setCode(ResponseCode.PULL_OFFSET_MOVED); // XXX: warn and notify me - LOG.info("the request offset: " + requestHeader.getQueueOffset() + " over flow badly, broker max offset: " + log.info("the request offset: " + requestHeader.getQueueOffset() + " over flow badly, broker max offset: " + getMessageResult.getMaxOffset() + ", consumer: " + channel.remoteAddress()); break; case OFFSET_OVERFLOW_ONE: @@ -280,7 +280,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re break; case OFFSET_TOO_SMALL: response.setCode(ResponseCode.PULL_OFFSET_MOVED); - LOG.info("the request offset too small. group={}, topic={}, requestOffset={}, brokerMinOffset={}, clientIp={}", + log.info("the request offset too small. group={}, topic={}, requestOffset={}, brokerMinOffset={}, clientIp={}", requestHeader.getConsumerGroup(), requestHeader.getTopic(), requestHeader.getQueueOffset(), getMessageResult.getMinOffset(), channel.remoteAddress()); break; @@ -356,12 +356,12 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re public void operationComplete(ChannelFuture future) throws Exception { getMessageResult.release(); if (!future.isSuccess()) { - LOG.error("transfer many message by pagecache failed, " + channel.remoteAddress(), future.cause()); + log.error("transfer many message by pagecache failed, " + channel.remoteAddress(), future.cause()); } } }); } catch (Throwable e) { - LOG.error("transfer many message by pagecache exception", e); + log.error("transfer many message by pagecache exception", e); getMessageResult.release(); } @@ -403,14 +403,14 @@ public void operationComplete(ChannelFuture future) throws Exception { event.setOffsetRequest(requestHeader.getQueueOffset()); event.setOffsetNew(getMessageResult.getNextBeginOffset()); this.generateOffsetMovedEvent(event); - LOG.warn( + log.warn( "PULL_OFFSET_MOVED:correction offset. topic={}, groupId={}, requestOffset={}, newOffset={}, suggestBrokerId={}", requestHeader.getTopic(), requestHeader.getConsumerGroup(), event.getOffsetRequest(), event.getOffsetNew(), responseHeader.getSuggestWhichBrokerId()); } else { responseHeader.setSuggestWhichBrokerId(subscriptionGroupConfig.getBrokerId()); response.setCode(ResponseCode.PULL_RETRY_IMMEDIATELY); - LOG.warn("PULL_OFFSET_MOVED:none correction. topic={}, groupId={}, requestOffset={}, suggestBrokerId={}", + log.warn("PULL_OFFSET_MOVED:none correction. topic={}, groupId={}, requestOffset={}, suggestBrokerId={}", requestHeader.getTopic(), requestHeader.getConsumerGroup(), requestHeader.getQueueOffset(), responseHeader.getSuggestWhichBrokerId()); } @@ -493,7 +493,7 @@ private void generateOffsetMovedEvent(final OffsetMovedEvent event) { PutMessageResult putMessageResult = this.brokerController.getMessageStore().putMessage(msgInner); } catch (Exception e) { - LOG.warn(String.format("generateOffsetMovedEvent Exception, %s", event.toString()), e); + log.warn(String.format("generateOffsetMovedEvent Exception, %s", event.toString()), e); } } @@ -512,21 +512,21 @@ public void run() { @Override public void operationComplete(ChannelFuture future) throws Exception { if (!future.isSuccess()) { - LOG.error("processRequestWrapper response to " + future.channel().remoteAddress() + " failed", + log.error("processRequestWrapper response to " + future.channel().remoteAddress() + " failed", future.cause()); - LOG.error(request.toString()); - LOG.error(response.toString()); + log.error(request.toString()); + log.error(response.toString()); } } }); } catch (Throwable e) { - LOG.error("processRequestWrapper process request over, but response failed", e); - LOG.error(request.toString()); - LOG.error(response.toString()); + log.error("processRequestWrapper process request over, but response failed", e); + log.error(request.toString()); + log.error(response.toString()); } } } catch (RemotingCommandException e1) { - LOG.error("excuteRequestWhenWakeup run", e1); + log.error("excuteRequestWhenWakeup run", e1); } } }; diff --git a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/topic/TopicConfigManager.java b/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/topic/TopicConfigManager.java index 94d7e9fd621..66eca3c6de5 100644 --- a/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/topic/TopicConfigManager.java +++ b/rocketmq-broker/src/main/java/com/alibaba/rocketmq/broker/topic/TopicConfigManager.java @@ -46,7 +46,7 @@ * @author shijia.wxr */ public class TopicConfigManager extends ConfigManager { - private static final Logger LOG = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME); + private static final Logger log = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME); private static final long LOCK_TIMEOUT_MILLIS = 3000; private transient final Lock lockTopicConfigTable = new ReentrantLock(); @@ -56,11 +56,9 @@ public class TopicConfigManager extends ConfigManager { private final Set systemTopicList = new HashSet(); private transient BrokerController brokerController; - public TopicConfigManager() { } - public TopicConfigManager(BrokerController brokerController) { this.brokerController = brokerController; { @@ -193,17 +191,17 @@ public TopicConfig createTopicInSendMessageMethod(final String topic, final Stri topicConfig.setTopicSysFlag(topicSysFlag); topicConfig.setTopicFilterType(defaultTopicConfig.getTopicFilterType()); } else { - LOG.warn("create new topic failed, because the default topic[" + defaultTopic + log.warn("create new topic failed, because the default topic[" + defaultTopic + "] no perm, " + defaultTopicConfig.getPerm() + " producer: " + remoteAddress); } } else { - LOG.warn("create new topic failed, because the default topic[" + defaultTopic + log.warn("create new topic failed, because the default topic[" + defaultTopic + "] not exist." + " producer: " + remoteAddress); } if (topicConfig != null) { - LOG.info("create new topic by default topic[" + defaultTopic + "], " + topicConfig + log.info("create new topic by default topic[" + defaultTopic + "], " + topicConfig + " producer: " + remoteAddress); this.topicConfigTable.put(topic, topicConfig); @@ -219,7 +217,7 @@ public TopicConfig createTopicInSendMessageMethod(final String topic, final Stri } } } catch (InterruptedException e) { - LOG.error("createTopicInSendMessageMethod exception", e); + log.error("createTopicInSendMessageMethod exception", e); } if (createNew) { @@ -253,7 +251,7 @@ public TopicConfig createTopicInSendMessageBackMethod( topicConfig.setPerm(perm); topicConfig.setTopicSysFlag(topicSysFlag); - LOG.info("create new topic {}", topicConfig); + log.info("create new topic {}", topicConfig); this.topicConfigTable.put(topic, topicConfig); createNew = true; this.dataVersion.nextVersion(); @@ -263,7 +261,7 @@ public TopicConfig createTopicInSendMessageBackMethod( } } } catch (InterruptedException e) { - LOG.error("createTopicInSendMessageBackMethod exception", e); + log.error("createTopicInSendMessageBackMethod exception", e); } if (createNew) { @@ -284,7 +282,7 @@ public void updateTopicUnitFlag(final String topic, final boolean unit) { topicConfig.setTopicSysFlag(TopicSysFlag.clearUnitFlag(oldTopicSysFlag)); } - LOG.info("update topic sys flag. oldTopicSysFlag={}, newTopicSysFlag", oldTopicSysFlag, + log.info("update topic sys flag. oldTopicSysFlag={}, newTopicSysFlag", oldTopicSysFlag, topicConfig.getTopicSysFlag()); this.topicConfigTable.put(topic, topicConfig); @@ -304,7 +302,7 @@ public void updateTopicUnitSubFlag(final String topic, final boolean hasUnitSub) topicConfig.setTopicSysFlag(TopicSysFlag.setUnitSubFlag(oldTopicSysFlag)); } - LOG.info("update topic sys flag. oldTopicSysFlag={}, newTopicSysFlag", oldTopicSysFlag, + log.info("update topic sys flag. oldTopicSysFlag={}, newTopicSysFlag", oldTopicSysFlag, topicConfig.getTopicSysFlag()); this.topicConfigTable.put(topic, topicConfig); @@ -319,9 +317,9 @@ public void updateTopicUnitSubFlag(final String topic, final boolean hasUnitSub) public void updateTopicConfig(final TopicConfig topicConfig) { TopicConfig old = this.topicConfigTable.put(topicConfig.getTopicName(), topicConfig); if (old != null) { - LOG.info("update topic config, old: " + old + " new: " + topicConfig); + log.info("update topic config, old: " + old + " new: " + topicConfig); } else { - LOG.info("create new topic, " + topicConfig); + log.info("create new topic, " + topicConfig); } this.dataVersion.nextVersion(); @@ -340,7 +338,7 @@ public void updateOrderTopicConfig(final KVTable orderKVTableFromNs) { if (topicConfig != null && !topicConfig.isOrder()) { topicConfig.setOrder(true); isChange = true; - LOG.info("update order topic config, topic={}, order={}", topic, true); + log.info("update order topic config, topic={}, order={}", topic, true); } } @@ -351,7 +349,7 @@ public void updateOrderTopicConfig(final KVTable orderKVTableFromNs) { if (topicConfig.isOrder()) { topicConfig.setOrder(false); isChange = true; - LOG.info("update order topic config, topic={}, order={}", topic, false); + log.info("update order topic config, topic={}, order={}", topic, false); } } } @@ -375,11 +373,11 @@ public boolean isOrderTopic(final String topic) { public void deleteTopicConfig(final String topic) { TopicConfig old = this.topicConfigTable.remove(topic); if (old != null) { - LOG.info("delete topic config OK, topic: " + old); + log.info("delete topic config OK, topic: " + old); this.dataVersion.nextVersion(); this.persist(); } else { - LOG.warn("delete topic config failed, topic: " + topic + " not exist"); + log.warn("delete topic config failed, topic: " + topic + " not exist"); } } @@ -426,7 +424,7 @@ private void printLoadDataWhenFirstBoot(final TopicConfigSerializeWrapper tcs) { Iterator> it = tcs.getTopicConfigTable().entrySet().iterator(); while (it.hasNext()) { Entry next = it.next(); - LOG.info("load exist local topic, {}", next.getValue().toString()); + log.info("load exist local topic, {}", next.getValue().toString()); } } diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ConfigManager.java b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ConfigManager.java index 3191509496a..2f11829b1f2 100644 --- a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ConfigManager.java +++ b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ConfigManager.java @@ -27,8 +27,7 @@ * @author shijia.wxr */ public abstract class ConfigManager { - private static final Logger PLOG = LoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME); - + private static final Logger log = LoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME); public abstract String encode(); @@ -42,11 +41,11 @@ public boolean load() { return this.loadBak(); } else { this.decode(jsonString); - PLOG.info("load {} OK", fileName); + log.info("load {} OK", fileName); return true; } } catch (Exception e) { - PLOG.error("load " + fileName + " Failed, and try to load backup file", e); + log.error("load " + fileName + " Failed, and try to load backup file", e); return this.loadBak(); } } @@ -60,11 +59,11 @@ private boolean loadBak() { String jsonString = MixAll.file2String(fileName + ".bak"); if (jsonString != null && jsonString.length() > 0) { this.decode(jsonString); - PLOG.info("load " + fileName + " OK"); + log.info("load " + fileName + " OK"); return true; } } catch (Exception e) { - PLOG.error("load " + fileName + " Failed", e); + log.error("load " + fileName + " Failed", e); return false; } @@ -80,7 +79,7 @@ public synchronized void persist() { try { MixAll.string2File(jsonString, fileName); } catch (IOException e) { - PLOG.error("persist file Exception, " + fileName, e); + log.error("persist file Exception, " + fileName, e); } } } diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ServiceThread.java b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ServiceThread.java index a84288c1444..b9a4d3f49e1 100644 --- a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ServiceThread.java +++ b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/ServiceThread.java @@ -28,7 +28,8 @@ * @author xinyuzhou.zxy */ public abstract class ServiceThread implements Runnable { - private static final Logger STLOG = LoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME); + private static final Logger log = LoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME); + private static final long JOIN_TIME = 90 * 1000; protected final Thread thread; @@ -59,7 +60,7 @@ public void shutdown() { public void shutdown(final boolean interrupt) { this.stopped = true; - STLOG.info("shutdown thread " + this.getServiceName() + " interrupt " + interrupt); + log.info("shutdown thread " + this.getServiceName() + " interrupt " + interrupt); if (hasNotified.compareAndSet(false, true)) { waitPoint.countDown(); // notify @@ -75,10 +76,10 @@ public void shutdown(final boolean interrupt) { this.thread.join(this.getJointime()); } long eclipseTime = System.currentTimeMillis() - beginTime; - STLOG.info("join thread " + this.getServiceName() + " eclipse time(ms) " + eclipseTime + " " + log.info("join thread " + this.getServiceName() + " eclipse time(ms) " + eclipseTime + " " + this.getJointime()); } catch (InterruptedException e) { - STLOG.error("Interrupted", e); + log.error("Interrupted", e); } } @@ -92,7 +93,7 @@ public void stop() { public void stop(final boolean interrupt) { this.stopped = true; - STLOG.info("stop thread " + this.getServiceName() + " interrupt " + interrupt); + log.info("stop thread " + this.getServiceName() + " interrupt " + interrupt); if (hasNotified.compareAndSet(false, true)) { waitPoint.countDown(); // notify @@ -105,7 +106,7 @@ public void stop(final boolean interrupt) { public void makeStop() { this.stopped = true; - STLOG.info("makestop thread " + this.getServiceName()); + log.info("makestop thread " + this.getServiceName()); } public void wakeup() { @@ -126,7 +127,7 @@ protected void waitForRunning(long interval) { try { waitPoint.await(interval, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { - STLOG.error("Interrupted", e); + log.error("Interrupted", e); } finally { hasNotified.set(false); this.onWaitEnd(); diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/UtilAll.java b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/UtilAll.java index d8b24afc3e3..2e4aa0baf1f 100644 --- a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/UtilAll.java +++ b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/UtilAll.java @@ -48,7 +48,6 @@ public class UtilAll { public static final String YYYY_MM_DD_HH_MM_SS_SSS = "yyyy-MM-dd#HH:mm:ss:SSS"; public static final String YYYY_MMDD_HHMMSS = "yyyyMMddHHmmss"; - public static int getPid() { RuntimeMXBean runtime = ManagementFactory.getRuntimeMXBean(); String name = runtime.getName(); // format: "pid@hostname" diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/NamesrvConfig.java b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/NamesrvConfig.java index 08db35794cc..7ced651df75 100644 --- a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/NamesrvConfig.java +++ b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/NamesrvConfig.java @@ -35,8 +35,8 @@ */ public class NamesrvConfig { private static final Logger log = LoggerFactory.getLogger(LoggerName.NAMESRV_LOGGER_NAME); - private String rocketmqHome = System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY, System.getenv(MixAll.ROCKETMQ_HOME_ENV)); + private String rocketmqHome = System.getProperty(MixAll.ROCKETMQ_HOME_PROPERTY, System.getenv(MixAll.ROCKETMQ_HOME_ENV)); private String kvConfigPath = System.getProperty("user.home") + File.separator + "namesrv" + File.separator + "kvConfig.json"; private String configStorePath = System.getProperty("user.home") + File.separator + "namesrv" + File.separator + "namesrv.properties"; private String productEnvName = "center"; diff --git a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/TopAddressing.java b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/TopAddressing.java index 2e4ad87ac49..3b972be63dc 100644 --- a/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/TopAddressing.java +++ b/rocketmq-common/src/main/java/com/alibaba/rocketmq/common/namesrv/TopAddressing.java @@ -38,11 +38,11 @@ */ public class TopAddressing { private static final Logger log = LoggerFactory.getLogger(LoggerName.COMMON_LOGGER_NAME); + private String nsAddr; private String wsAddr; private String unitName; - public TopAddressing(final String wsAddr) { this(wsAddr, null); } diff --git a/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/DynaCode.java b/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/DynaCode.java index e17e5d2a306..b46e2e624de 100644 --- a/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/DynaCode.java +++ b/rocketmq-filtersrv/src/main/java/com/alibaba/rocketmq/filtersrv/filter/DynaCode.java @@ -36,7 +36,7 @@ public class DynaCode { - private static final Logger LOGGER = LoggerFactory.getLogger(LoggerName.FILTERSRV_LOGGER_NAME); + private static final Logger log = LoggerFactory.getLogger(LoggerName.FILTERSRV_LOGGER_NAME); private static final String FILE_SP = System.getProperty("file.separator"); @@ -196,7 +196,7 @@ private String[] uploadSrcFile() throws Exception { loadClass.put(getFullClassName(code), null); } if (null != srcFile) { - LOGGER.warn("Dyna Create Java Source File:---->" + srcFile.getAbsolutePath()); + log.warn("Dyna Create Java Source File:---->" + srcFile.getAbsolutePath()); srcFileAbsolutePaths.add(srcFile.getAbsolutePath()); srcFile.deleteOnExit(); } @@ -242,9 +242,9 @@ private void loadClass(Set classFullNames) throws ClassNotFoundException Class classz = classLoader.loadClass(key); if (null != classz) { loadClass.put(key, classz); - LOGGER.info("Dyna Load Java Class File OK:----> className: " + key); + log.info("Dyna Load Java Class File OK:----> className: " + key); } else { - LOGGER.error("Dyna Load Java Class File Fail:----> className: " + key); + log.error("Dyna Load Java Class File Fail:----> className: " + key); } } } diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/ServiceThread.java b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/ServiceThread.java index f98ec373280..e1686d5bdf5 100644 --- a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/ServiceThread.java +++ b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/common/ServiceThread.java @@ -28,20 +28,18 @@ */ public abstract class ServiceThread implements Runnable { private static final Logger log = LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING); + private static final long JOIN_TIME = 90 * 1000; protected final Thread thread; protected volatile boolean hasNotified = false; protected volatile boolean stopped = false; - public ServiceThread() { this.thread = new Thread(this, this.getServiceName()); } - public abstract String getServiceName(); - public void start() { this.thread.start(); } diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyDecoder.java b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyDecoder.java index 9e685336a7e..e295a4a31ac 100644 --- a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyDecoder.java +++ b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyDecoder.java @@ -34,6 +34,7 @@ */ public class NettyDecoder extends LengthFieldBasedFrameDecoder { private static final Logger log = LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING); + private static final int FRAME_MAX_LENGTH = // Integer.parseInt(System.getProperty("com.rocketmq.remoting.frameMaxLength", "16777216")); diff --git a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingAbstract.java b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingAbstract.java index 70ae5b5159a..4f23dae70ec 100644 --- a/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingAbstract.java +++ b/rocketmq-remoting/src/main/java/com/alibaba/rocketmq/remoting/netty/NettyRemotingAbstract.java @@ -53,15 +53,12 @@ * @author shijia.wxr */ public abstract class NettyRemotingAbstract { - private static final Logger PLOG = LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING); - + private static final Logger log = LoggerFactory.getLogger(RemotingHelper.ROCKETMQ_REMOTING); protected final Semaphore semaphoreOneway; - protected final Semaphore semaphoreAsync; - protected final ConcurrentHashMap responseTable = new ConcurrentHashMap(256); @@ -126,9 +123,9 @@ public void run() { try { ctx.writeAndFlush(response); } catch (Throwable e) { - PLOG.error("process request over, but response failed", e); - PLOG.error(cmd.toString()); - PLOG.error(response.toString()); + log.error("process request over, but response failed", e); + log.error(cmd.toString()); + log.error(response.toString()); } } else { @@ -137,8 +134,8 @@ public void run() { } catch (Throwable e) { if (!"com.aliyun.openservices.ons.api.impl.authority.exception.AuthenticationException" .equals(e.getClass().getCanonicalName())) { - PLOG.error("process request exception", e); - PLOG.error(cmd.toString()); + log.error("process request exception", e); + log.error(cmd.toString()); } if (!cmd.isOnewayRPC()) { @@ -164,7 +161,7 @@ public void run() { pair.getObject2().submit(requestTask); } catch (RejectedExecutionException e) { if ((System.currentTimeMillis() % 10000) == 0) { - PLOG.warn(RemotingHelper.parseChannelRemoteAddr(ctx.channel()) // + log.warn(RemotingHelper.parseChannelRemoteAddr(ctx.channel()) // + ", too many requests and system thread pool busy, RejectedExecutionException " // + pair.getObject2().toString() // + " request code: " + cmd.getCode()); @@ -183,7 +180,7 @@ public void run() { RemotingCommand.createResponseCommand(RemotingSysResponseCode.REQUEST_CODE_NOT_SUPPORTED, error); response.setOpaque(opaque); ctx.writeAndFlush(response); - PLOG.error(RemotingHelper.parseChannelRemoteAddr(ctx.channel()) + error); + log.error(RemotingHelper.parseChannelRemoteAddr(ctx.channel()) + error); } } @@ -208,13 +205,13 @@ public void run() { try { responseFuture.executeInvokeCallback(); } catch (Throwable e) { - PLOG.warn("execute callback in executor exception, and callback throw", e); + log.warn("execute callback in executor exception, and callback throw", e); } } }); } catch (Exception e) { runInThisThread = true; - PLOG.warn("execute callback in executor exception, maybe executor busy", e); + log.warn("execute callback in executor exception, maybe executor busy", e); } } else { runInThisThread = true; @@ -224,15 +221,15 @@ public void run() { try { responseFuture.executeInvokeCallback(); } catch (Throwable e) { - PLOG.warn("executeInvokeCallback Exception", e); + log.warn("executeInvokeCallback Exception", e); } } } else { responseFuture.putResponse(cmd); } } else { - PLOG.warn("receive response, but not matched any request, " + RemotingHelper.parseChannelRemoteAddr(ctx.channel())); - PLOG.warn(cmd.toString()); + log.warn("receive response, but not matched any request, " + RemotingHelper.parseChannelRemoteAddr(ctx.channel())); + log.warn(cmd.toString()); } } @@ -251,7 +248,7 @@ public void scanResponseTable() { rep.release(); it.remove(); rfList.add(rep); - PLOG.warn("remove timeout request, " + rep); + log.warn("remove timeout request, " + rep); } } @@ -259,7 +256,7 @@ public void scanResponseTable() { try { rf.executeInvokeCallback(); } catch (Throwable e) { - PLOG.warn("scanResponseTable, operationComplete Exception", e); + log.warn("scanResponseTable, operationComplete Exception", e); } } } @@ -285,7 +282,7 @@ public void operationComplete(ChannelFuture f) throws Exception { responseTable.remove(opaque); responseFuture.setCause(f.cause()); responseFuture.putResponse(null); - PLOG.warn("send a request command to channel <" + addr + "> failed."); + log.warn("send a request command to channel <" + addr + "> failed."); } }); @@ -331,17 +328,17 @@ public void operationComplete(ChannelFuture f) throws Exception { try { responseFuture.executeInvokeCallback(); } catch (Throwable e) { - PLOG.warn("excute callback in writeAndFlush addListener, and callback throw", e); + log.warn("excute callback in writeAndFlush addListener, and callback throw", e); } finally { responseFuture.release(); } - PLOG.warn("send a request command to channel <{}> failed.", RemotingHelper.parseChannelRemoteAddr(channel)); + log.warn("send a request command to channel <{}> failed.", RemotingHelper.parseChannelRemoteAddr(channel)); } }); } catch (Exception e) { responseFuture.release(); - PLOG.warn("send a request command to channel <" + RemotingHelper.parseChannelRemoteAddr(channel) + "> Exception", e); + log.warn("send a request command to channel <" + RemotingHelper.parseChannelRemoteAddr(channel) + "> Exception", e); throw new RemotingSendRequestException(RemotingHelper.parseChannelRemoteAddr(channel), e); } } else { @@ -351,7 +348,7 @@ public void operationComplete(ChannelFuture f) throws Exception { this.semaphoreAsync.getQueueLength(), // this.semaphoreAsync.availablePermits()// ); - PLOG.warn(info); + log.warn(info); throw new RemotingTooMuchRequestException(info); } } @@ -368,13 +365,13 @@ public void invokeOnewayImpl(final Channel channel, final RemotingCommand reques public void operationComplete(ChannelFuture f) throws Exception { once.release(); if (!f.isSuccess()) { - PLOG.warn("send a request command to channel <" + channel.remoteAddress() + "> failed."); + log.warn("send a request command to channel <" + channel.remoteAddress() + "> failed."); } } }); } catch (Exception e) { once.release(); - PLOG.warn("write send a request command to channel <" + channel.remoteAddress() + "> failed."); + log.warn("write send a request command to channel <" + channel.remoteAddress() + "> failed."); throw new RemotingSendRequestException(RemotingHelper.parseChannelRemoteAddr(channel), e); } } else { @@ -387,7 +384,7 @@ public void operationComplete(ChannelFuture f) throws Exception { this.semaphoreOneway.getQueueLength(), // this.semaphoreOneway.availablePermits()// ); - PLOG.warn(info); + log.warn(info); throw new RemotingTimeoutException(info); } } @@ -402,14 +399,14 @@ public void putNettyEvent(final NettyEvent event) { if (this.eventQueue.size() <= maxSize) { this.eventQueue.add(event); } else { - PLOG.warn("event queue size[{}] enough, so drop this event {}", this.eventQueue.size(), event.toString()); + log.warn("event queue size[{}] enough, so drop this event {}", this.eventQueue.size(), event.toString()); } } @Override public void run() { - PLOG.info(this.getServiceName() + " service started"); + log.info(this.getServiceName() + " service started"); final ChannelEventListener listener = NettyRemotingAbstract.this.getChannelEventListener(); @@ -436,11 +433,11 @@ public void run() { } } } catch (Exception e) { - PLOG.warn(this.getServiceName() + " service has exception. ", e); + log.warn(this.getServiceName() + " service has exception. ", e); } } - PLOG.info(this.getServiceName() + " service end"); + log.info(this.getServiceName() + " service end"); } diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ConsumeQueue.java b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ConsumeQueue.java index f7f83060cf2..884582efbcc 100644 --- a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ConsumeQueue.java +++ b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ConsumeQueue.java @@ -29,9 +29,9 @@ * @author shijia.wxr */ public class ConsumeQueue { + private static final Logger log = LoggerFactory.getLogger(LoggerName.STORE_LOGGER_NAME); public static final int CQ_STORE_UNIT_SIZE = 20; - private static final Logger log = LoggerFactory.getLogger(LoggerName.STORE_LOGGER_NAME); private static final Logger LOG_ERROR = LoggerFactory.getLogger(LoggerName.STORE_ERROR_LOGGER_NAME); private final DefaultMessageStore defaultMessageStore; diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/schedule/ScheduleMessageService.java b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/schedule/ScheduleMessageService.java index e243a7e59a4..4aa1932ab67 100644 --- a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/schedule/ScheduleMessageService.java +++ b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/schedule/ScheduleMessageService.java @@ -39,8 +39,9 @@ * */ public class ScheduleMessageService extends ConfigManager { - public static final String SCHEDULE_TOPIC = "SCHEDULE_TOPIC_XXXX"; private static final Logger log = LoggerFactory.getLogger(LoggerName.STORE_LOGGER_NAME); + + public static final String SCHEDULE_TOPIC = "SCHEDULE_TOPIC_XXXX"; private static final long FIRST_DELAY_TIME = 1000L; private static final long DELAY_FOR_A_WHILE = 100L; private static final long DELAY_FOR_A_PERIOD = 10000L; diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/stats/BrokerStats.java b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/stats/BrokerStats.java index 539d4bed5ab..f67703deb76 100644 --- a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/stats/BrokerStats.java +++ b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/stats/BrokerStats.java @@ -27,6 +27,7 @@ */ public class BrokerStats { private static final Logger log = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME); + private final DefaultMessageStore defaultMessageStore; private volatile long msgPutTotalYesterdayMorning; From d4a9d16f6e2f6a55ee3eae579b03243e3f15a319 Mon Sep 17 00:00:00 2001 From: shtykh_roman Date: Tue, 10 Jan 2017 12:43:53 +0900 Subject: [PATCH 4/5] [ROCKETMQ-6] Use logger for exceptions instead of e.printStackTrace(). JIRA issue: https://issues.apache.org/jira/browse/ROCKETMQ-6 Changed logging to use parameterized template formatting. --- .../processor/PullMessageProcessor.java | 16 +++++++------- .../broker/topic/TopicConfigManager.java | 21 +++++++++---------- .../apache/rocketmq/common/ConfigManager.java | 8 +++---- .../rocketmq/filtersrv/filter/DynaCode.java | 6 +++--- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java index 8d5dce84657..e5e01c53b27 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java @@ -88,7 +88,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re response.setOpaque(request.getOpaque()); if (log.isDebugEnabled()) { - log.debug("receive PullMessage request command, " + request); + log.debug("receive PullMessage request command, {}", request); } if (!PermName.isReadable(this.brokerController.getBrokerConfig().getBrokerPermission())) { @@ -119,7 +119,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re TopicConfig topicConfig = this.brokerController.getTopicConfigManager().selectTopicConfig(requestHeader.getTopic()); if (null == topicConfig) { - log.error("the topic " + requestHeader.getTopic() + " not exist, consumer: " + RemotingHelper.parseChannelRemoteAddr(channel)); + log.error("the topic {} not exist, consumer: {}", requestHeader.getTopic(), RemotingHelper.parseChannelRemoteAddr(channel)); response.setCode(ResponseCode.TOPIC_NOT_EXIST); response.setRemark(String.format("topic[%s] not exist, apply first please! %s", requestHeader.getTopic(), FAQUrl.suggestTodo(FAQUrl.APPLY_TOPIC_URL))); return response; @@ -132,7 +132,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re } if (requestHeader.getQueueId() < 0 || requestHeader.getQueueId() >= topicConfig.getReadQueueNums()) { - String errorInfo = "queueId[" + requestHeader.getQueueId() + "] is illagal,Topic :" + requestHeader.getTopic() + String errorInfo = "queueId[" + requestHeader.getQueueId() + "] is illegal,Topic :" + requestHeader.getTopic() + " topicConfig.readQueueNums: " + topicConfig.getReadQueueNums() + " consumer: " + channel.remoteAddress(); log.warn(errorInfo); response.setCode(ResponseCode.SYSTEM_ERROR); @@ -259,8 +259,8 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re case OFFSET_OVERFLOW_BADLY: response.setCode(ResponseCode.PULL_OFFSET_MOVED); // XXX: warn and notify me - log.info("the request offset: " + requestHeader.getQueueOffset() + " over flow badly, broker max offset: " - + getMessageResult.getMaxOffset() + ", consumer: " + channel.remoteAddress()); + log.info("the request offset: {} over flow badly, broker max offset: {}, consumer: {}", + requestHeader.getQueueOffset(), getMessageResult.getMaxOffset(), channel.remoteAddress()); break; case OFFSET_OVERFLOW_ONE: response.setCode(ResponseCode.PULL_NOT_FOUND); @@ -344,7 +344,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re public void operationComplete(ChannelFuture future) throws Exception { getMessageResult.release(); if (!future.isSuccess()) { - log.error("transfer many message by pagecache failed, " + channel.remoteAddress(), future.cause()); + log.error("transfer many message by pagecache failed, {}", channel.remoteAddress(), future.cause()); } } }); @@ -497,8 +497,8 @@ public void run() { @Override public void operationComplete(ChannelFuture future) throws Exception { if (!future.isSuccess()) { - log.error("processRequestWrapper response to " + future.channel().remoteAddress() + " failed", - future.cause()); + log.error("processRequestWrapper response to {} failed", + future.channel().remoteAddress(), future.cause()); log.error(request.toString()); log.error(response.toString()); } diff --git a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java index 4ed80d120ab..ea59b9d5aae 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java @@ -181,18 +181,17 @@ public TopicConfig createTopicInSendMessageMethod(final String topic, final Stri topicConfig.setTopicSysFlag(topicSysFlag); topicConfig.setTopicFilterType(defaultTopicConfig.getTopicFilterType()); } else { - log.warn("create new topic failed, because the default topic[" + defaultTopic - + "] no perm, " + defaultTopicConfig.getPerm() + " producer: " - + remoteAddress); + log.warn("Create new topic failed, because the default topic[{}] has no perm [{}] producer:[{}]", + defaultTopic, defaultTopicConfig.getPerm(), remoteAddress); } } else { - log.warn("create new topic failed, because the default topic[" + defaultTopic - + "] not exist." + " producer: " + remoteAddress); + log.warn("Create new topic failed, because the default topic[{}] not exist. producer:[{}]", + defaultTopic, remoteAddress); } if (topicConfig != null) { - log.info("create new topic by default topic[" + defaultTopic + "], " + topicConfig - + " producer: " + remoteAddress); + log.info("Create new topic by default topic:[{}] config:[{}] producer:[{}]", + defaultTopic, topicConfig, remoteAddress); this.topicConfigTable.put(topic, topicConfig); @@ -307,9 +306,9 @@ public void updateTopicUnitSubFlag(final String topic, final boolean hasUnitSub) public void updateTopicConfig(final TopicConfig topicConfig) { TopicConfig old = this.topicConfigTable.put(topicConfig.getTopicName(), topicConfig); if (old != null) { - log.info("update topic config, old: " + old + " new: " + topicConfig); + log.info("update topic config, old:[{}] new:[{}]", old, topicConfig); } else { - log.info("create new topic, " + topicConfig); + log.info("create new topic [{}]", topicConfig); } this.dataVersion.nextVersion(); @@ -362,11 +361,11 @@ public boolean isOrderTopic(final String topic) { public void deleteTopicConfig(final String topic) { TopicConfig old = this.topicConfigTable.remove(topic); if (old != null) { - log.info("delete topic config OK, topic: " + old); + log.info("delete topic config OK, topic: {}", old); this.dataVersion.nextVersion(); this.persist(); } else { - log.warn("delete topic config failed, topic: " + topic + " not exist"); + log.warn("delete topic config failed, topic: {} not exists", topic); } } diff --git a/common/src/main/java/org/apache/rocketmq/common/ConfigManager.java b/common/src/main/java/org/apache/rocketmq/common/ConfigManager.java index 6d64c96f972..c33ebdf324e 100644 --- a/common/src/main/java/org/apache/rocketmq/common/ConfigManager.java +++ b/common/src/main/java/org/apache/rocketmq/common/ConfigManager.java @@ -40,7 +40,7 @@ public boolean load() { return true; } } catch (Exception e) { - log.error("load " + fileName + " Failed, and try to load backup file", e); + log.error("load [{}] failed, and try to load backup file", fileName, e); return this.loadBak(); } } @@ -54,11 +54,11 @@ private boolean loadBak() { String jsonString = MixAll.file2String(fileName + ".bak"); if (jsonString != null && jsonString.length() > 0) { this.decode(jsonString); - log.info("load " + fileName + " OK"); + log.info("load [{}] OK", fileName); return true; } } catch (Exception e) { - log.error("load " + fileName + " Failed", e); + log.error("load [{}] Failed", fileName, e); return false; } @@ -74,7 +74,7 @@ public synchronized void persist() { try { MixAll.string2File(jsonString, fileName); } catch (IOException e) { - log.error("persist file Exception, " + fileName, e); + log.error("persist file [{}] exception", fileName, e); } } } diff --git a/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/filter/DynaCode.java b/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/filter/DynaCode.java index 8ecc584674c..347c2dc5a57 100644 --- a/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/filter/DynaCode.java +++ b/filtersrv/src/main/java/org/apache/rocketmq/filtersrv/filter/DynaCode.java @@ -232,7 +232,7 @@ private String[] uploadSrcFile() throws Exception { loadClass.put(getFullClassName(code), null); } if (null != srcFile) { - log.warn("Dyna Create Java Source File:---->" + srcFile.getAbsolutePath()); + log.warn("Dyna Create Java Source File:----> {}", srcFile.getAbsolutePath()); srcFileAbsolutePaths.add(srcFile.getAbsolutePath()); srcFile.deleteOnExit(); } @@ -278,9 +278,9 @@ private void loadClass(Set classFullNames) throws ClassNotFoundException Class classz = classLoader.loadClass(key); if (null != classz) { loadClass.put(key, classz); - log.info("Dyna Load Java Class File OK:----> className: " + key); + log.info("Dyna Load Java Class File OK:----> className: {}", key); } else { - log.error("Dyna Load Java Class File Fail:----> className: " + key); + log.error("Dyna Load Java Class File Fail:----> className: {}", key); } } } From f6af319ef7ed9de8db8bb26fde1c748baaa5a043 Mon Sep 17 00:00:00 2001 From: shtykh_roman Date: Wed, 11 Jan 2017 21:43:17 +0900 Subject: [PATCH 5/5] Removed 'isDebugEnabled' where there is no impact on performance. --- .../rocketmq/broker/processor/PullMessageProcessor.java | 4 +--- .../rocketmq/broker/processor/SendMessageProcessor.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java index e5e01c53b27..d88af47caff 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/PullMessageProcessor.java @@ -87,9 +87,7 @@ private RemotingCommand processRequest(final Channel channel, RemotingCommand re response.setOpaque(request.getOpaque()); - if (log.isDebugEnabled()) { - log.debug("receive PullMessage request command, {}", request); - } + log.debug("receive PullMessage request command, {}", request); if (!PermName.isReadable(this.brokerController.getBrokerConfig().getBrokerPermission())) { response.setCode(ResponseCode.NO_PERMISSION); diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java index a4404621c0d..0f99de373f4 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java @@ -251,9 +251,7 @@ private RemotingCommand sendMessage(final ChannelHandlerContext ctx, // response.addExtField(MessageConst.PROPERTY_MSG_REGION, this.brokerController.getBrokerConfig().getRegionId()); response.addExtField(MessageConst.PROPERTY_TRACE_SWITCH, String.valueOf(this.brokerController.getBrokerConfig().isTraceOn())); - if (log.isDebugEnabled()) { - log.debug("receive SendMessage request command, {}", request); - } + log.debug("receive SendMessage request command, {}", request); final long startTimstamp = this.brokerController.getBrokerConfig().getStartAcceptSendRequestTimeStamp(); if (this.brokerController.getMessageStore().now() < startTimstamp) {