Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #9102] Fix bazel-compile (ubuntu-latest) ci run failure #9103

Open
wants to merge 9 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public void updateSubscriptionGroupConfig() {
}

private boolean notToBeExecuted() {
return MixAll.isMac();
return MixAll.isMac() || !MixAll.isJdk8();
}
@Test
public void testUpdateSubscriptionGroupConfigList_NullConfigList() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.rocketmq.client.impl.admin;

import org.apache.rocketmq.client.exception.MQClientException;
import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.message.MessageConst;
import org.apache.rocketmq.common.message.MessageDecoder;
import org.apache.rocketmq.common.message.MessageExt;
Expand Down Expand Up @@ -205,6 +206,9 @@ public void assertUpdateOrCreateTopicWithError() {

@Test
public void assertUpdateOrCreateSubscriptionGroupWithSuccess() throws Exception {
if (!MixAll.isJdk8()) {
return;
}
setResponseSuccess(null);
SubscriptionGroupConfig config = mock(SubscriptionGroupConfig.class);
CompletableFuture<Void> actual = mqClientAdminImpl.updateOrCreateSubscriptionGroup(defaultBrokerAddr, config, defaultTimeout);
Expand All @@ -213,6 +217,9 @@ public void assertUpdateOrCreateSubscriptionGroupWithSuccess() throws Exception

@Test
public void assertUpdateOrCreateSubscriptionGroupWithError() {
if (!MixAll.isJdk8()) {
return;
}
setResponseError();
SubscriptionGroupConfig config = mock(SubscriptionGroupConfig.class);
CompletableFuture<Void> actual = mqClientAdminImpl.updateOrCreateSubscriptionGroup(defaultBrokerAddr, config, defaultTimeout);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,9 @@ public void testSendHeartbeatToBrokerV1() {

@Test
public void testSendHeartbeatToBrokerV2() throws MQBrokerException, RemotingException, InterruptedException {
if (!MixAll.isJdk8()) {
return;
}
consumerTable.put(group, createMQConsumerInner());
when(clientConfig.isUseHeartbeatV2()).thenReturn(true);
HeartbeatV2Result heartbeatV2Result = mock(HeartbeatV2Result.class);
Expand All @@ -307,6 +310,9 @@ public void testSendHeartbeatToAllBrokerWithLockV1() {

@Test
public void testSendHeartbeatToAllBrokerWithLockV2() {
if (!MixAll.isJdk8()) {
return;
}
brokerAddrTable.put(defaultBroker, createBrokerAddrMap());
consumerTable.put(group, createMQConsumerInner());
when(clientConfig.isUseHeartbeatV2()).thenReturn(true);
Expand Down
4 changes: 4 additions & 0 deletions common/src/main/java/org/apache/rocketmq/common/MixAll.java
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,10 @@ public static boolean isMac() {
return OS.contains("mac");
}

public static boolean isJdk8() {
return System.getProperty("java.version").startsWith("1.8.");
}

public static boolean isUnix() {
return OS.contains("nix")
|| OS.contains("nux")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.rocketmq.controller.impl.manager;

import org.apache.rocketmq.common.ControllerConfig;
import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.controller.elect.ElectPolicy;
import org.apache.rocketmq.controller.elect.impl.DefaultElectPolicy;
import org.apache.rocketmq.controller.helper.BrokerValidPredicate;
Expand Down Expand Up @@ -471,6 +472,9 @@ public void testCleanBrokerData() {

@Test
public void testSerialize() {
if (!MixAll.isJdk8()) {
return;
}
mockMetaData();
byte[] data;
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@
import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.net.InetSocketAddress;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;

import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.TopicConfig;
import org.apache.rocketmq.common.UtilAll;
Expand Down Expand Up @@ -91,7 +92,7 @@ public void init() throws Exception {
registerRouteInfoManager();

logger = mock(Logger.class);
setFinalStatic(DefaultRequestProcessor.class.getDeclaredField("log"), logger);
FieldUtils.writeStaticField(DefaultRequestProcessor.class.getDeclaredField("log"), logger, true);
}

@Test
Expand Down Expand Up @@ -636,14 +637,6 @@ private static RemotingCommand genSampleRegisterCmd(boolean reg) {
return request;
}

private static void setFinalStatic(Field field, Object newValue) throws Exception {
field.setAccessible(true);
Field modifiersField = Field.class.getDeclaredField("modifiers");
modifiersField.setAccessible(true);
modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
field.set(null, newValue);
}

private void registerRouteInfoManager() {
TopicConfigSerializeWrapper topicConfigSerializeWrapper = new TopicConfigSerializeWrapper();
ConcurrentHashMap<String, TopicConfig> topicConfigConcurrentHashMap = new ConcurrentHashMap<>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import io.grpc.netty.shaded.io.netty.buffer.Unpooled;
import io.grpc.netty.shaded.io.netty.handler.codec.haproxy.HAProxyTLV;
import java.nio.charset.StandardCharsets;

import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.proxy.config.ConfigurationManager;
import org.junit.Before;
import org.junit.Test;
Expand All @@ -34,16 +36,22 @@ public class ProxyAndTlsProtocolNegotiatorTest {

@Before
public void setUp() throws Exception {
if (!MixAll.isJdk8()) {
return;
}
ConfigurationManager.intConfig();
ConfigurationManager.getProxyConfig().setTlsTestModeEnable(true);
negotiator = new ProxyAndTlsProtocolNegotiator();
}

@Test
public void handleHAProxyTLV() {
if (!MixAll.isJdk8()) {
return;
}
ByteBuf content = Unpooled.buffer();
content.writeBytes("xxxx".getBytes(StandardCharsets.UTF_8));
HAProxyTLV haProxyTLV = new HAProxyTLV((byte) 0xE1, content);
negotiator.handleHAProxyTLV(haProxyTLV, Attributes.newBuilder());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.rocketmq.remoting;

import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.utils.NetworkUtil;
import org.apache.rocketmq.remoting.common.TlsMode;
import org.apache.rocketmq.remoting.exception.RemotingSendRequestException;
Expand Down Expand Up @@ -281,6 +282,10 @@ public void clientAcceptsUntrustedServerCert() throws Exception {

@Test
public void testTlsConfigThroughFile() throws Exception {
if (!MixAll.isJdk8()) {
return;
}

File file = tempFolder.newFile("tls.config");
tlsTestModeEnable = true;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
*/
package org.apache.rocketmq.tools.command.connection;

import java.util.HashSet;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.remoting.protocol.body.Connection;
import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
import org.apache.rocketmq.srvutil.ServerUtil;
Expand All @@ -30,6 +30,8 @@
import org.junit.Before;
import org.junit.Test;

import java.util.HashSet;

import static org.mockito.Mockito.mock;

public class ConsumerConnectionSubCommandTest {
Expand All @@ -39,18 +41,28 @@ public class ConsumerConnectionSubCommandTest {

@Before
public void before() {
if (!MixAll.isJdk8()) {
return;
}
brokerMocker = startOneBroker();
nameServerMocker = NameServerMocker.startByDefaultConf(brokerMocker.listenPort());
}

@After
public void after() {
brokerMocker.shutdown();
nameServerMocker.shutdown();
if (null != brokerMocker) {
brokerMocker.shutdown();
}
if (null != nameServerMocker) {
nameServerMocker.shutdown();
}
}

@Test
public void testExecute() throws SubCommandException {
if (!MixAll.isJdk8()) {
return;
}
ConsumerConnectionSubCommand cmd = new ConsumerConnectionSubCommand();
Options options = ServerUtil.buildCommandlineOptions(new Options());
String[] subargs = new String[] {"-g default-consumer-group", "-b localhost:" + brokerMocker.listenPort()};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.remoting.protocol.body.Connection;
import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
import org.apache.rocketmq.srvutil.ServerUtil;
Expand All @@ -40,18 +41,28 @@ public class ProducerConnectionSubCommandTest {

@Before
public void before() {
if (!MixAll.isJdk8()) {
return;
}
brokerMocker = startOneBroker();
nameServerMocker = NameServerMocker.startByDefaultConf(brokerMocker.listenPort());
}

@After
public void after() {
brokerMocker.shutdown();
nameServerMocker.shutdown();
if (null != brokerMocker) {
brokerMocker.shutdown();
}
if (null != nameServerMocker) {
nameServerMocker.shutdown();
}
}

@Test
public void testExecute() throws SubCommandException {
if (!MixAll.isJdk8()) {
return;
}
ProducerConnectionSubCommand cmd = new ProducerConnectionSubCommand();
Options options = ServerUtil.buildCommandlineOptions(new Options());
String[] subargs = new String[] {"-g default-producer-group", "-t unit-test", String.format("-n localhost:%d", nameServerMocker.listenPort())};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.message.MessageQueue;
import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
import org.apache.rocketmq.remoting.protocol.admin.OffsetWrapper;
Expand All @@ -40,19 +41,29 @@ public class ConsumerProgressSubCommandTest {

@Before
public void before() {
if (!MixAll.isJdk8()) {
return;
}
brokerMocker = startOneBroker();
nameServerMocker = NameServerMocker.startByDefaultConf(brokerMocker.listenPort());
}

@After
public void after() {
brokerMocker.shutdown();
nameServerMocker.shutdown();
if (null != brokerMocker) {
brokerMocker.shutdown();
}
if (null != nameServerMocker) {
nameServerMocker.shutdown();
}
}

@Ignore
@Test
public void testExecute() throws SubCommandException {
if (!MixAll.isJdk8()) {
return;
}
ConsumerProgressSubCommand cmd = new ConsumerProgressSubCommand();
Options options = ServerUtil.buildCommandlineOptions(new Options());
String[] subargs = new String[] {"-g default-group",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.remoting.protocol.body.Connection;
import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
import org.apache.rocketmq.srvutil.ServerUtil;
Expand All @@ -40,18 +41,28 @@ public class ConsumerStatusSubCommandTest {

@Before
public void before() {
if (!MixAll.isJdk8()) {
return;
}
brokerMocker = startOneBroker();
nameServerMocker = NameServerMocker.startByDefaultConf(brokerMocker.listenPort());
}

@After
public void after() {
brokerMocker.shutdown();
nameServerMocker.shutdown();
if (null != brokerMocker) {
brokerMocker.shutdown();
}
if (null != nameServerMocker) {
nameServerMocker.shutdown();
}
}

@Test
public void testExecute() throws SubCommandException {
if (!MixAll.isJdk8()) {
return;
}
ConsumerStatusSubCommand cmd = new ConsumerStatusSubCommand();
Options options = ServerUtil.buildCommandlineOptions(new Options());
String[] subargs = new String[] {"-g default-group", "-i cid_one",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
import org.apache.rocketmq.remoting.protocol.body.Connection;
import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
Expand All @@ -43,18 +44,28 @@ public class GetConsumerConfigSubCommandTest {

@Before
public void before() {
if (!MixAll.isJdk8()) {
return;
}
brokerMocker = startOneBroker();
nameServerMocker = startNameServer();
}

@After
public void after() {
brokerMocker.shutdown();
nameServerMocker.shutdown();
if (null != brokerMocker) {
brokerMocker.shutdown();
}
if (null != nameServerMocker) {
nameServerMocker.shutdown();
}
}

@Test
public void testExecute() throws SubCommandException {
if (!MixAll.isJdk8()) {
return;
}
GetConsumerConfigSubCommand cmd = new GetConsumerConfigSubCommand();
Options options = ServerUtil.buildCommandlineOptions(new Options());
String[] subargs = new String[] {"-g group_test", String.format("-n localhost:%d", nameServerMocker.listenPort())};
Expand Down
Loading