apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.13'

Browse Source
This commit is contained in:
Rohit Yadav 2020-03-05 12:37:51 +05:30
commit d0e3c577c0
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
View File

@ -397,9 +397,12 @@ public class VirtualRoutingResource {
} }
public boolean configureHostParams(final Map<String, String> params) { public boolean configureHostParams(final Map<String, String> params) {
if (_params.get("router.aggregation.command.each.timeout") == null) { if (_params.get("router.aggregation.command.each.timeout") != null) {
String value = (String)params.get("router.aggregation.command.each.timeout"); String value = (String)params.get("router.aggregation.command.each.timeout");
_eachTimeout = Duration.standardSeconds(NumbersUtil.parseInt(value, 10)); _eachTimeout = Duration.standardSeconds(NumbersUtil.parseLong(value, 600));
if (s_logger.isDebugEnabled()){
s_logger.debug("The router.aggregation.command.each.timeout in seconds is set to " + _eachTimeout.getStandardSeconds());
}
} }
return true; return true;

4
engine/components-api/src/main/java/com/cloud/agent/AgentManager.java
View File

@ -16,6 +16,8 @@
// under the License. // under the License.
package com.cloud.agent; package com.cloud.agent;
import java.util.Map;
import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.ConfigKey;
import com.cloud.agent.api.Answer; import com.cloud.agent.api.Answer;
@ -153,5 +155,5 @@ public interface AgentManager {
void notifyMonitorsOfRemovedHost(long hostId, long clusterId); void notifyMonitorsOfRemovedHost(long hostId, long clusterId);
void propagateChangeToAgents(); void propagateChangeToAgents(Map<String, String> params);
} }

6
engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java
View File

@ -1824,11 +1824,11 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
} }
@Override @Override
public void propagateChangeToAgents() { public void propagateChangeToAgents(Map<String, String> params) {
if (params != null && ! params.isEmpty()) {
s_logger.debug("Propagating changes on host parameters to the agents"); s_logger.debug("Propagating changes on host parameters to the agents");
Map<Long, List<Long>> hostsPerZone = getHostsPerZone(); Map<Long, List<Long>> hostsPerZone = getHostsPerZone();
Map<String, String> params = new HashMap<String, String>();
params.put("router.aggregation.command.each.timeout", _configDao.getValue("router.aggregation.command.each.timeout"));
sendCommandToAgents(hostsPerZone, params); sendCommandToAgents(hostsPerZone, params);
} }
} }
}

4
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
View File

@ -1116,8 +1116,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
storage.configure("Storage", new HashMap<String, Object>()); storage.configure("Storage", new HashMap<String, Object>());
if (params.get("router.aggregation.command.each.timeout") != null) { if (params.get("router.aggregation.command.each.timeout") != null) {
String value = (String)params.get("router.aggregation.command.each.timeout"); String value = (String)params.get("router.aggregation.command.each.timeout");
Integer intValue = NumbersUtil.parseInt(value, 600); Long longValue = NumbersUtil.parseLong(value, 600);
storage.persist("router.aggregation.command.each.timeout", String.valueOf(intValue)); storage.persist("router.aggregation.command.each.timeout", String.valueOf(longValue));
} }
return true; return true;

4
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -486,7 +486,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
globalSettingUpdated.equals(IndirectAgentLBServiceImpl.IndirectAgentLBAlgorithm.key())) { globalSettingUpdated.equals(IndirectAgentLBServiceImpl.IndirectAgentLBAlgorithm.key())) {
_indirectAgentLB.propagateMSListToAgents(); _indirectAgentLB.propagateMSListToAgents();
} else if (globalSettingUpdated.equals(Config.RouterAggregationCommandEachTimeout.toString())) { } else if (globalSettingUpdated.equals(Config.RouterAggregationCommandEachTimeout.toString())) {
_agentManager.propagateChangeToAgents(); Map<String, String> params = new HashMap<String, String>();
params.put(Config.RouterAggregationCommandEachTimeout.toString(), _configDao.getValue(Config.RouterAggregationCommandEachTimeout.toString()));
_agentManager.propagateChangeToAgents(params);
} }
} }
}); });