Skip to content
Permalink
Browse files
ARTEMIS-3803 Fix first NetworkHealthCheck execution
The NetworkHealthCheck hasn't to execute the default command if a custom
command is defined.
  • Loading branch information
brusdev authored and clebertsuconic committed Apr 26, 2022
1 parent 5e6f599 commit eb6264239e3b69f55c07b16aa654b6b1c104c88f
Showing 2 changed files with 76 additions and 3 deletions.
@@ -582,11 +582,11 @@ public final synchronized void start() throws Exception {
public void reloadNetworkHealthCheck() {
networkHealthCheck.setTimeUnit(TimeUnit.MILLISECONDS).setPeriod(configuration.getNetworkCheckPeriod()).
setNetworkTimeout(configuration.getNetworkCheckTimeout()).
parseAddressList(configuration.getNetworkCheckList()).
parseURIList(configuration.getNetworkCheckURLList()).
setNICName(configuration.getNetworkCheckNIC()).
setIpv4Command(configuration.getNetworkCheckPingCommand()).
setIpv6Command(configuration.getNetworkCheckPing6Command());
setIpv6Command(configuration.getNetworkCheckPing6Command()).
parseAddressList(configuration.getNetworkCheckList()).
parseURIList(configuration.getNetworkCheckURLList());

networkHealthCheck.addComponent(networkCheckMonitor);
}
@@ -0,0 +1,73 @@
/**
* 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
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* 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.activemq.artemis.tests.integration.server;

import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.NetworkHealthCheck;
import org.apache.activemq.artemis.logs.AssertionLoggerHandler;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.jboss.logmanager.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;

import java.util.logging.Level;

public class NetworkHealthCheckTest extends ActiveMQTestBase {

private static final Logger logManager = org.jboss.logmanager.Logger.getLogger(NetworkHealthCheck.class.getPackage().getName());
private static java.util.logging.Level previousLevel = logManager.getLevel();

@BeforeClass
public static void prepareLogger() {
logManager.setLevel(Level.ALL);
AssertionLoggerHandler.startCapture();
}

@AfterClass
public static void clearLogger() {
AssertionLoggerHandler.stopCapture();
logManager.setLevel(previousLevel);
}


@Test
public void testCustomIpv4Command() throws Exception {
final int checkingTimeout = 1;
final String checkingHost = "10.0.0.1";
final String customIpv4Command = "DUMMYPING %d %s";


Configuration config = createBasicConfig()
.setNetworkCheckTimeout(checkingTimeout)
.setNetworkCheckList(checkingHost)
.setNetworkCheckPingCommand(customIpv4Command);

ActiveMQServer server = createServer(false, config);

server.start();
try {
Assert.assertTrue(AssertionLoggerHandler.findText(String.format(customIpv4Command, checkingTimeout, checkingHost)));
Assert.assertFalse(AssertionLoggerHandler.findText(String.format(NetworkHealthCheck.IPV4_DEFAULT_COMMAND, checkingTimeout, checkingHost)));
} finally {
server.stop();
}
}
}

0 comments on commit eb62642

Please sign in to comment.