Skip to content
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 @@ -23,6 +23,8 @@

public class SetHostParamsCommand extends Command {

public static final String SYSTEM_TRAFFIC_LABELS = "systemTrafficLabels";

Map<String, String> params;

public SetHostParamsCommand(Map<String, String> params) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,12 @@ enum TapAgentsAction {

void propagateChangeToAgents(Map<String, String> params);

/**
* Pushes the current KVM network labels (bridges) of the physical networks of the given zone to all
* the KVM agents of that zone, so they can preserve system bridges when cleaning up VMs.
*/
void propagateSystemTrafficLabelsToAgents(long zoneId);

boolean transferDirectAgentsFromMS(String fromMsUuid, long fromMsId, long timeoutDurationInMs, boolean excludeHostsInMaintenance);

int getHostSshPort(HostVO host);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
import com.cloud.host.dao.HostDetailsDao;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.hypervisor.HypervisorGuruManager;
import com.cloud.network.dao.PhysicalNetworkDao;
import com.cloud.org.Cluster;
import com.cloud.resource.Discoverer;
import com.cloud.resource.ResourceManager;
Expand Down Expand Up @@ -228,6 +229,8 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
ResourceManager _resourceMgr;
@Inject
ManagementServiceConfiguration mgmtServiceConf;
@Inject
protected PhysicalNetworkDao _physicalNetworkDao;

protected final ConfigKey<Integer> Workers = new ConfigKey<>("Advanced", Integer.class, "workers", "5",
"Number of worker threads handling remote agent connections.", false);
Expand Down Expand Up @@ -2200,12 +2203,19 @@ public void processConnect(final Host host, final StartupCommand cmd, final bool
return;
}

if (((StartupRoutingCommand)cmd).getHypervisorType() == HypervisorType.KVM || ((StartupRoutingCommand)cmd).getHypervisorType() == HypervisorType.LXC) {
HypervisorType hypervisorType = ((StartupRoutingCommand) cmd).getHypervisorType();
if (hypervisorType == HypervisorType.KVM || hypervisorType == HypervisorType.LXC) {
Map<String, String> params = new HashMap<>();
params.put(Config.RouterAggregationCommandEachTimeout.toString(), _configDao.getValue(Config.RouterAggregationCommandEachTimeout.toString()));
params.put(Config.MigrateWait.toString(), _configDao.getValue(Config.MigrateWait.toString()));
params.put(NetworkOrchestrationService.TUNGSTEN_ENABLED.key(), String.valueOf(NetworkOrchestrationService.TUNGSTEN_ENABLED.valueIn(host.getDataCenterId())));
params.put(ReconcileCommandService.ReconcileCommandsEnabled.key(), String.valueOf(_reconcileCommandsEnabled));
if (hypervisorType == HypervisorType.KVM) {
String systemTrafficLabels = getSystemTrafficLabels(host.getDataCenterId());
if (systemTrafficLabels != null) {
params.put(SetHostParamsCommand.SYSTEM_TRAFFIC_LABELS, systemTrafficLabels);
}
}

try {
SetHostParamsCommand cmds = new SetHostParamsCommand(params);
Expand Down Expand Up @@ -2284,6 +2294,34 @@ public void propagateChangeToAgents(Map<String, String> params) {
}
}

private String getSystemTrafficLabels(long zoneId) {
try {
return String.join(",", _physicalNetworkDao.getKvmNetworkLabelsInZone(zoneId));
} catch (Exception e) {
logger.warn("Failed to retrieve the KVM network labels for zone [{}].", zoneId, e);
return null;
}
}

@Override
public void propagateSystemTrafficLabelsToAgents(long zoneId) {
final String systemTrafficLabels = getSystemTrafficLabels(zoneId);
if (systemTrafficLabels == null) {
logger.warn("Skipping system traffic labels propagation to agents for zone [{}] because they could not be retrieved.", zoneId);
return;
}

final Map<String, String> params = new HashMap<>();
params.put(SetHostParamsCommand.SYSTEM_TRAFFIC_LABELS, systemTrafficLabels);

final List<HostVO> hosts = _resourceMgr.listAllUpHostsInOneZoneByHypervisor(HypervisorType.KVM, zoneId);
final List<Long> hostIds = hosts.stream().map(HostVO::getId).collect(Collectors.toList());

final Map<Long, List<Long>> hostsPerZone = new HashMap<>();
hostsPerZone.put(zoneId, hostIds);
sendCommandToAgents(hostsPerZone, params);
}

@Override
public boolean transferDirectAgentsFromMS(String fromMsUuid, long fromMsId, long timeoutDurationInMs, boolean excludeHostsInMaintenance) {
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.cloud.network.dao;

import java.util.List;
import java.util.Set;

import com.cloud.network.Networks.TrafficType;
import com.cloud.utils.db.GenericDao;
Expand All @@ -27,4 +28,9 @@ public interface PhysicalNetworkDao extends GenericDao<PhysicalNetworkVO, Long>
List<PhysicalNetworkVO> listByZoneIncludingRemoved(long zoneId);

List<PhysicalNetworkVO> listByZoneAndTrafficType(long dataCenterId, TrafficType trafficType);

/**
* Returns the KVM network labels (bridges) of all the physical networks of the given zone.
*/
Set<String> getKvmNetworkLabelsInZone(long zoneId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,21 @@
// under the License.
package com.cloud.network.dao;

import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

import javax.annotation.PostConstruct;
import javax.inject.Inject;

import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;

import com.cloud.network.Networks.TrafficType;
import com.cloud.utils.db.DB;
import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.JoinBuilder;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
Expand All @@ -33,16 +39,32 @@
@Component
@DB()
public class PhysicalNetworkDaoImpl extends GenericDaoBase<PhysicalNetworkVO, Long> implements PhysicalNetworkDao {
final SearchBuilder<PhysicalNetworkVO> ZoneSearch;
protected SearchBuilder<PhysicalNetworkVO> ZoneSearch;
protected GenericSearchBuilder<PhysicalNetworkTrafficTypeVO, String> KvmNetworkLabelsInZoneSearch;

@Inject
protected PhysicalNetworkTrafficTypeDao _trafficTypeDao;

protected PhysicalNetworkDaoImpl() {
super();
}

@PostConstruct
protected void init() {
ZoneSearch = createSearchBuilder();
ZoneSearch.and("dataCenterId", ZoneSearch.entity().getDataCenterId(), Op.EQ);
ZoneSearch.done();

KvmNetworkLabelsInZoneSearch = _trafficTypeDao.createSearchBuilder(String.class);
KvmNetworkLabelsInZoneSearch.selectFields(KvmNetworkLabelsInZoneSearch.entity().getKvmNetworkLabel());

final SearchBuilder<PhysicalNetworkVO> pnSearch = createSearchBuilder();
pnSearch.and("dataCenterId", pnSearch.entity().getDataCenterId(), Op.EQ);
pnSearch.and("removed", pnSearch.entity().getRemoved(), Op.NULL);

KvmNetworkLabelsInZoneSearch.join("pnSearch", pnSearch, KvmNetworkLabelsInZoneSearch.entity().getPhysicalNetworkId(),
pnSearch.entity().getId(), JoinBuilder.JoinType.INNER);
KvmNetworkLabelsInZoneSearch.done();
}

@Override
Expand Down Expand Up @@ -76,4 +98,25 @@ public List<PhysicalNetworkVO> listByZoneAndTrafficType(long dataCenterId, Traff

return listBy(sc);
}

@Override
public Set<String> getKvmNetworkLabelsInZone(long zoneId) {
SearchCriteria<String> sc = KvmNetworkLabelsInZoneSearch.create();
sc.setJoinParameters("pnSearch", "dataCenterId", zoneId);

return filterKvmNetworkLabels(_trafficTypeDao.customSearch(sc, null));
}

private Set<String> filterKvmNetworkLabels(List<String> labels) {
if (labels == null) {
return Collections.emptySet();
}
Set<String> result = new HashSet<>();
for (String label : labels) {
if (StringUtils.isNotBlank(label)) {
result.add(label);
}
}
return result;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.network.dao;

import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;

import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;

import com.cloud.utils.db.GenericSearchBuilder;
import com.cloud.utils.db.JoinBuilder;
import com.cloud.utils.db.SearchBase;
import com.cloud.utils.db.SearchCriteria;

@RunWith(MockitoJUnitRunner.class)
public class PhysicalNetworkDaoImplTest {

@Mock
private PhysicalNetworkTrafficTypeDao trafficTypeDao;

@Mock
private GenericSearchBuilder<PhysicalNetworkTrafficTypeVO, String> kvmNetworkLabelsSearch;

@Mock
private PhysicalNetworkTrafficTypeVO trafficTypeEntity;

@Mock
private SearchCriteria<String> searchCriteria;

private PhysicalNetworkDaoImpl createDao() {
PhysicalNetworkDaoImpl dao = new PhysicalNetworkDaoImpl();
dao._trafficTypeDao = trafficTypeDao;
Mockito.when(trafficTypeDao.createSearchBuilder(String.class)).thenReturn(kvmNetworkLabelsSearch);
Mockito.when(kvmNetworkLabelsSearch.entity()).thenReturn(trafficTypeEntity);
Mockito.when(kvmNetworkLabelsSearch.create()).thenReturn(searchCriteria);
dao.init();
return dao;
}

@Test
public void getKvmNetworkLabelsInZoneFiltersBlankAndDuplicateLabels() {
PhysicalNetworkDaoImpl dao = createDao();
Mockito.when(trafficTypeDao.customSearch(searchCriteria, null)).thenReturn(
Arrays.asList("cloudbr0", " ", "", null, "brbond0-100", "cloudbr0"));

Set<String> labels = dao.getKvmNetworkLabelsInZone(42L);

Assert.assertEquals(new HashSet<>(Arrays.asList("cloudbr0", "brbond0-100")), labels);
Mockito.verify(searchCriteria).setJoinParameters("pnSearch", "dataCenterId", 42L);

ArgumentCaptor<SearchBase<?, ?, ?>> physicalNetworkSearchCaptor = ArgumentCaptor.forClass(SearchBase.class);
Mockito.verify(kvmNetworkLabelsSearch).join(Mockito.eq("pnSearch"), physicalNetworkSearchCaptor.capture(),
Mockito.any(), Mockito.any(), Mockito.eq(JoinBuilder.JoinType.INNER));
SearchCriteria<?> physicalNetworkCriteria = physicalNetworkSearchCaptor.getValue().create();
physicalNetworkCriteria.setParameters("dataCenterId", 42L);
Assert.assertTrue(physicalNetworkCriteria.getWhereClause().contains("removed IS NULL"));
}

@Test
public void getKvmNetworkLabelsInZoneReturnsEmptySetWhenNoLabelsAreFound() {
PhysicalNetworkDaoImpl dao = createDao();
Mockito.when(trafficTypeDao.customSearch(searchCriteria, null)).thenReturn(null);

Assert.assertTrue(dao.getKvmNetworkLabelsInZone(42L).isEmpty());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

Expand Down Expand Up @@ -347,6 +348,10 @@ private void createVnet(String vnetId, String pif, String brName, String protoco
}
}

protected boolean isSystemTrafficLabel(String brName, Set<String> systemTrafficLabels) {
return StringUtils.isNotBlank(brName) && systemTrafficLabels != null && systemTrafficLabels.contains(brName);
}

private void deleteVnetBr(String brName, boolean deleteBr) {
synchronized (_vnetBridgeMonitor) {
String cmdout = Script.runSimpleBashScript("ls /sys/class/net/" + brName);
Expand Down Expand Up @@ -391,6 +396,12 @@ private void deleteVnetBr(String brName, boolean deleteBr) {
scriptPath = _modifyVlanPath;
}

final Set<String> systemTrafficLabels = _libvirtComputingResource.getSystemTrafficLabels();
if (isSystemTrafficLabel(brName, systemTrafficLabels)) {
logger.info("Bridge [{}] is part of the system traffic labels {}; therefore, it will not be removed.", brName, systemTrafficLabels);
return;
}

final Script command = new Script(scriptPath, _timeout, logger);
command.add("-o", "delete");
command.add("-v", vNetId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
import com.cloud.agent.api.PingRoutingCommand;
import com.cloud.agent.api.PingRoutingWithNwGroupsCommand;
import com.cloud.agent.api.SecurityGroupRulesCmd;
import com.cloud.agent.api.SetHostParamsCommand;
import com.cloud.agent.api.SetupGuestNetworkCommand;
import com.cloud.agent.api.StartupCommand;
import com.cloud.agent.api.StartupRoutingCommand;
Expand Down Expand Up @@ -590,6 +591,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
*/
private static final String COMMAND_MERGE_SNAPSHOT = "virsh blockcommit %s %s --base %s";

private volatile Set<String> systemTrafficLabels = Collections.emptySet();

public long getHypervisorLibvirtVersion() {
return hypervisorLibvirtVersion;
}
Expand Down Expand Up @@ -1676,6 +1679,10 @@ public boolean configureHostParams(final Map<String, String> params) {
isTungstenEnabled = Boolean.parseBoolean(params.get(NetworkOrchestrationService.TUNGSTEN_ENABLED.key()));
}

if (params.get(SetHostParamsCommand.SYSTEM_TRAFFIC_LABELS) != null) {
setSystemTrafficLabels(parseSystemTrafficLabels(params.get(SetHostParamsCommand.SYSTEM_TRAFFIC_LABELS)));
}

if (params.get(ReconcileCommandService.ReconcileCommandsEnabled.key()) != null) {
isReconcileCommandsEnabled = Boolean.parseBoolean(params.get(ReconcileCommandService.ReconcileCommandsEnabled.key()));
}
Expand All @@ -1691,6 +1698,27 @@ public boolean configureHostParams(final Map<String, String> params) {
return true;
}

public Set<String> getSystemTrafficLabels() {
return systemTrafficLabels;
}

protected void setSystemTrafficLabels(Set<String> systemTrafficLabels) {
this.systemTrafficLabels = Collections.unmodifiableSet(systemTrafficLabels);
}

protected Set<String> parseSystemTrafficLabels(String labels) {
if (StringUtils.isBlank(labels)) {
return Collections.emptySet();
}
Set<String> result = new HashSet<>();
for (String label : labels.split(",")) {
if (StringUtils.isNotBlank(label)) {
result.add(label.trim());
}
}
return result;
}

private void configureAgentHooks() {
agentHooksBasedir = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.AGENT_HOOKS_BASEDIR);
LOGGER.debug("agent.hooks.basedir is " + agentHooksBasedir);
Expand Down
Loading
Loading