Merge remote-tracking branch 'upstream/develop' into fix-issue-603

broker/src/main/java/org/apache/rocketmq/broker/processor/AdminBrokerProcessor.java

@@ -116,6 +116,7 @@ import org.apache.rocketmq.remoting.netty.NettyRequestProcessor;
 import org.apache.rocketmq.remoting.protocol.LanguageCode;
 import org.apache.rocketmq.remoting.protocol.RemotingCommand;
 import org.apache.rocketmq.remoting.protocol.RemotingSerializable;
+import org.apache.rocketmq.remoting.protocol.RemotingSysResponseCode;
 import org.apache.rocketmq.store.ConsumeQueue;
 import org.apache.rocketmq.store.ConsumeQueueExt;
 import org.apache.rocketmq.store.DefaultMessageStore;
@@ -235,10 +236,8 @@ public class AdminBrokerProcessor extends AsyncNettyRequestProcessor implements
             case RequestCode.GET_BROKER_CLUSTER_ACL_CONFIG:
                 return getBrokerClusterAclConfig(ctx, request);
             default:
-                break;
+                return getUnknownCmdResponse(ctx, request);
         }
-
-        return null;
     }
 
     @Override
@@ -459,6 +458,13 @@ public class AdminBrokerProcessor extends AsyncNettyRequestProcessor implements
         return null;
     }
 
+    private RemotingCommand getUnknownCmdResponse(ChannelHandlerContext ctx, RemotingCommand request) {
+        String error = " request type " + request.getCode() + " not supported";
+        final RemotingCommand response =
+                RemotingCommand.createResponseCommand(RemotingSysResponseCode.REQUEST_CODE_NOT_SUPPORTED, error);
+        return response;
+    }
+
     private RemotingCommand getAllTopicConfig(ChannelHandlerContext ctx, RemotingCommand request) {
         final RemotingCommand response = RemotingCommand.createResponseCommand(GetAllTopicConfigResponseHeader.class);
         // final GetAllTopicConfigResponseHeader responseHeader =

example/src/main/java/org/apache/rocketmq/example/benchmark/Consumer.java

@@ -189,8 +189,7 @@ public class Consumer {
         opt = new Option("g", "group", true, "Consumer group name, Default: benchmark_consumer");
         opt.setRequired(false);
         options.addOption(opt);
-
-        opt = new Option("p", "group suffix enable", true, "Consumer group suffix enable, Default: false");
+        opt = new Option("p", "group prefix enable", true, "Is group prefix enable, Default: false");
         opt.setRequired(false);
         options.addOption(opt);
 

tools/src/main/java/org/apache/rocketmq/tools/command/acl/DeleteAccessConfigSubCommand.java

@@ -44,10 +44,10 @@ public class DeleteAccessConfigSubCommand implements SubCommand {
     public Options buildCommandlineOptions(Options options) {
         OptionGroup optionGroup = new OptionGroup();
 
-        Option opt = new Option("b", "brokerAddr", true, "delete acl config account to which broker");
+        Option opt = new Option("b", "brokerAddr", true, "delete acl config account from which broker");
         optionGroup.addOption(opt);
 
-        opt = new Option("c", "clusterName", true, "delete cl config account to which cluster");
+        opt = new Option("c", "clusterName", true, "delete acl config account from which cluster");
         optionGroup.addOption(opt);
 
         optionGroup.setRequired(true);
@@ -76,7 +76,7 @@ public class DeleteAccessConfigSubCommand implements SubCommand {
                 defaultMQAdminExt.start();
                 defaultMQAdminExt.deletePlainAccessConfig(addr, accessKey);
 
-                System.out.printf("delete plain access config account to %s success.%n", addr);
+                System.out.printf("delete plain access config account from %s success.%n", addr);
                 System.out.printf("account's accesskey is:%s", accessKey);
                 return;
 
@@ -89,7 +89,7 @@ public class DeleteAccessConfigSubCommand implements SubCommand {
                     CommandUtil.fetchMasterAddrByClusterName(defaultMQAdminExt, clusterName);
                 for (String addr : masterSet) {
                     defaultMQAdminExt.deletePlainAccessConfig(addr, accessKey);
-                    System.out.printf("delete plain access config account to %s success.%n", addr);
+                    System.out.printf("delete plain access config account from %s success.%n", addr);
                 }
 
                 System.out.printf("account's accesskey is:%s", accessKey);

tools/src/main/java/org/apache/rocketmq/tools/command/acl/UpdateAccessConfigSubCommand.java

@@ -50,7 +50,7 @@ public class UpdateAccessConfigSubCommand implements SubCommand {
         Option opt = new Option("b", "brokerAddr", true, "update acl config file to which broker");
         optionGroup.addOption(opt);
 
-        opt = new Option("c", "clusterName", true, "update cl config file to which cluster");
+        opt = new Option("c", "clusterName", true, "update acl config file to which cluster");
         optionGroup.addOption(opt);
 
         optionGroup.setRequired(true);