http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3818257a/engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java b/engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java index 9f1eca6..c7e30e3 100644 --- a/engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java +++ b/engine/orchestration/src/com/cloud/vm/VmWorkJobDispatcher.java @@ -20,7 +20,6 @@ import java.util.Map; import javax.inject.Inject; -import org.apache.log4j.Logger; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.framework.jobs.AsyncJob; @@ -34,7 +33,6 @@ import com.cloud.utils.component.AdapterBase; import com.cloud.vm.dao.VMInstanceDao; public class VmWorkJobDispatcher extends AdapterBase implements AsyncJobDispatcher { - private static final Logger s_logger = Logger.getLogger(VmWorkJobDispatcher.class); @Inject private VirtualMachineManagerImpl _vmMgr; @Inject @@ -65,23 +63,23 @@ public class VmWorkJobDispatcher extends AdapterBase implements AsyncJobDispatch try { workClz = Class.forName(job.getCmd()); } catch (ClassNotFoundException e) { - s_logger.error("VM work class " + cmd + " is not found" + ", job origin: " + job.getRelated(), e); + logger.error("VM work class " + cmd + " is not found" + ", job origin: " + job.getRelated(), e); _asyncJobMgr.completeAsyncJob(job.getId(), JobInfo.Status.FAILED, 0, e.getMessage()); return; } work = VmWorkSerializer.deserialize(workClz, job.getCmdInfo()); if(work == null) { - s_logger.error("Unable to deserialize VM work " + job.getCmd() + ", job info: " + job.getCmdInfo() + ", job origin: " + job.getRelated()); + logger.error("Unable to deserialize VM work " + job.getCmd() + ", job info: " + job.getCmdInfo() + ", job origin: " + job.getRelated()); _asyncJobMgr.completeAsyncJob(job.getId(), JobInfo.Status.FAILED, 0, "Unable to deserialize VM work"); return; } - if (s_logger.isDebugEnabled()) - s_logger.debug("Run VM work job: " + cmd + " for VM " + work.getVmId() + ", job origin: " + job.getRelated()); + if (logger.isDebugEnabled()) + logger.debug("Run VM work job: " + cmd + " for VM " + work.getVmId() + ", job origin: " + job.getRelated()); try { if (_handlers == null || _handlers.isEmpty()) { - s_logger.error("Invalid startup configuration, no work job handler is found. cmd: " + job.getCmd() + ", job info: " + job.getCmdInfo() + logger.error("Invalid startup configuration, no work job handler is found. cmd: " + job.getCmd() + ", job info: " + job.getCmdInfo() + ", job origin: " + job.getRelated()); _asyncJobMgr.completeAsyncJob(job.getId(), JobInfo.Status.FAILED, 0, "Invalid startup configuration. no job handler is found"); return; @@ -90,7 +88,7 @@ public class VmWorkJobDispatcher extends AdapterBase implements AsyncJobDispatch VmWorkJobHandler handler = _handlers.get(work.getHandlerName()); if (handler == null) { - s_logger.error("Unable to find work job handler. handler name: " + work.getHandlerName() + ", job cmd: " + job.getCmd() + logger.error("Unable to find work job handler. handler name: " + work.getHandlerName() + ", job cmd: " + job.getCmd() + ", job info: " + job.getCmdInfo() + ", job origin: " + job.getRelated()); _asyncJobMgr.completeAsyncJob(job.getId(), JobInfo.Status.FAILED, 0, "Unable to find work job handler"); return; @@ -105,14 +103,14 @@ public class VmWorkJobDispatcher extends AdapterBase implements AsyncJobDispatch CallContext.unregister(); } } finally { - if (s_logger.isDebugEnabled()) - s_logger.debug("Done with run of VM work job: " + cmd + " for VM " + work.getVmId() + ", job origin: " + job.getRelated()); + if (logger.isDebugEnabled()) + logger.debug("Done with run of VM work job: " + cmd + " for VM " + work.getVmId() + ", job origin: " + job.getRelated()); } } catch(InvalidParameterValueException e) { - s_logger.error("Unable to complete " + job + ", job origin:" + job.getRelated()); + logger.error("Unable to complete " + job + ", job origin:" + job.getRelated()); _asyncJobMgr.completeAsyncJob(job.getId(), JobInfo.Status.FAILED, 0, _asyncJobMgr.marshallResultObject(e)); } catch(Throwable e) { - s_logger.error("Unable to complete " + job + ", job origin:" + job.getRelated(), e); + logger.error("Unable to complete " + job + ", job origin:" + job.getRelated(), e); //RuntimeException ex = new RuntimeException("Job failed due to exception " + e.getMessage()); _asyncJobMgr.completeAsyncJob(job.getId(), JobInfo.Status.FAILED, 0, _asyncJobMgr.marshallResultObject(e));
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3818257a/engine/orchestration/src/com/cloud/vm/VmWorkJobWakeupDispatcher.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/vm/VmWorkJobWakeupDispatcher.java b/engine/orchestration/src/com/cloud/vm/VmWorkJobWakeupDispatcher.java index 520a550..d4da63b 100644 --- a/engine/orchestration/src/com/cloud/vm/VmWorkJobWakeupDispatcher.java +++ b/engine/orchestration/src/com/cloud/vm/VmWorkJobWakeupDispatcher.java @@ -24,7 +24,6 @@ import java.util.Map; import javax.inject.Inject; -import org.apache.log4j.Logger; import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.framework.jobs.AsyncJob; @@ -47,7 +46,6 @@ import com.cloud.vm.dao.VMInstanceDao; * Current code base uses blocking calls to wait for job completion */ public class VmWorkJobWakeupDispatcher extends AdapterBase implements AsyncJobDispatcher { - private static final Logger s_logger = Logger.getLogger(VmWorkJobWakeupDispatcher.class); @Inject private VmWorkJobDao _workjobDao; @@ -69,7 +67,7 @@ public class VmWorkJobWakeupDispatcher extends AdapterBase implements AsyncJobDi try { List<AsyncJobJoinMapVO> joinRecords = _joinMapDao.listJoinRecords(job.getId()); if (joinRecords.size() != 1) { - s_logger.warn("AsyncJob-" + job.getId() + logger.warn("AsyncJob-" + job.getId() + " received wakeup call with un-supported joining job number: " + joinRecords.size()); // if we fail wakeup-execution for any reason, avoid release sync-source if there is any @@ -84,7 +82,7 @@ public class VmWorkJobWakeupDispatcher extends AdapterBase implements AsyncJobDi try { workClz = Class.forName(job.getCmd()); } catch (ClassNotFoundException e) { - s_logger.error("VM work class " + job.getCmd() + " is not found", e); + logger.error("VM work class " + job.getCmd() + " is not found", e); return; } @@ -105,14 +103,14 @@ public class VmWorkJobWakeupDispatcher extends AdapterBase implements AsyncJobDi handler.invoke(_vmMgr); } else { assert (false); - s_logger.error("Unable to find wakeup handler " + joinRecord.getWakeupHandler() + + logger.error("Unable to find wakeup handler " + joinRecord.getWakeupHandler() + " when waking up job-" + job.getId()); } } finally { CallContext.unregister(); } } catch (Throwable e) { - s_logger.warn("Unexpected exception in waking up job-" + job.getId()); + logger.warn("Unexpected exception in waking up job-" + job.getId()); // if we fail wakeup-execution for any reason, avoid release sync-source if there is any job.setSyncSource(null); @@ -132,11 +130,11 @@ public class VmWorkJobWakeupDispatcher extends AdapterBase implements AsyncJobDi method.setAccessible(true); } catch (SecurityException e) { assert (false); - s_logger.error("Unexpected exception", e); + logger.error("Unexpected exception", e); return null; } catch (NoSuchMethodException e) { assert (false); - s_logger.error("Unexpected exception", e); + logger.error("Unexpected exception", e); return null; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3818257a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java index b21b230..50681d4 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineClusterDaoImpl.java @@ -28,7 +28,6 @@ import java.util.Map; import javax.ejb.Local; import javax.inject.Inject; -import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity; @@ -53,7 +52,6 @@ import com.cloud.utils.exception.CloudRuntimeException; @Component(value = "EngineClusterDao") @Local(value = EngineClusterDao.class) public class EngineClusterDaoImpl extends GenericDaoBase<EngineClusterVO, Long> implements EngineClusterDao { - private static final Logger s_logger = Logger.getLogger(EngineClusterDaoImpl.class); protected final SearchBuilder<EngineClusterVO> PodSearch; protected final SearchBuilder<EngineClusterVO> HyTypeWithoutGuidSearch; @@ -274,7 +272,7 @@ public class EngineClusterDaoImpl extends GenericDaoBase<EngineClusterVO, Long> int rows = update(vo, sc); - if (rows == 0 && s_logger.isDebugEnabled()) { + if (rows == 0 && logger.isDebugEnabled()) { EngineClusterVO dbCluster = findByIdIncludingRemoved(vo.getId()); if (dbCluster != null) { StringBuilder str = new StringBuilder("Unable to update ").append(vo.toString()); @@ -301,7 +299,7 @@ public class EngineClusterDaoImpl extends GenericDaoBase<EngineClusterVO, Long> .append("; updatedTime=") .append(oldUpdatedTime); } else { - s_logger.debug("Unable to update dataCenter: id=" + vo.getId() + ", as there is no such dataCenter exists in the database anymore"); + logger.debug("Unable to update dataCenter: id=" + vo.getId() + ", as there is no such dataCenter exists in the database anymore"); } } return rows > 0; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3818257a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index 50ddc59..6208193 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -51,7 +51,6 @@ import org.apache.cloudstack.framework.messagebus.MessageBus; import org.apache.cloudstack.framework.messagebus.PublishScope; import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.cloudstack.region.PortableIpDao; -import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; @@ -213,7 +212,6 @@ import com.cloud.vm.dao.VMInstanceDao; */ @Local(value = {NetworkOrchestrationService.class}) public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestrationService, Listener, Configurable { - static final Logger s_logger = Logger.getLogger(NetworkOrchestrator.class); @Inject EntityManager _entityMgr; @@ -580,7 +578,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra Network.State.getStateMachine().registerListener(new NetworkStateListener(_usageEventDao, _networksDao, _configDao)); - s_logger.info("Network Manager is configured."); + logger.info("Network Manager is configured."); return true; } @@ -624,8 +622,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra .getBroadcastDomainType() == BroadcastDomainType.Vxlan))) { List<NetworkVO> configs = _networksDao.listBy(owner.getId(), offering.getId(), plan.getDataCenterId()); if (configs.size() > 0) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Found existing network configuration for offering " + offering + ": " + configs.get(0)); + if (logger.isDebugEnabled()) { + logger.debug("Found existing network configuration for offering " + offering + ": " + configs.get(0)); } if (errorIfAlreadySetup) { @@ -692,7 +690,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra return networks; } finally { - s_logger.debug("Releasing lock for " + locked); + logger.debug("Releasing lock for " + locked); _accountDao.releaseFromLockTable(locked.getId()); } } @@ -774,7 +772,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } } if (nics.size() != size) { - s_logger.warn("Number of nics " + nics.size() + " doesn't match number of requested nics " + size); + logger.warn("Number of nics " + nics.size() + " doesn't match number of requested nics " + size); throw new CloudRuntimeException("Number of nics " + nics.size() + " doesn't match number of requested networks " + size); } @@ -791,7 +789,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException, ConcurrentOperationException { NetworkVO ntwkVO = _networksDao.findById(network.getId()); - s_logger.debug("Allocating nic for vm " + vm.getVirtualMachine() + " in network " + network + " with requested profile " + requested); + logger.debug("Allocating nic for vm " + vm.getVirtualMachine() + " in network " + network + " with requested profile " + requested); NetworkGuru guru = AdapterBase.getAdapterByName(networkGurus, ntwkVO.getGuruName()); if (requested != null && requested.getMode() == null) { @@ -961,7 +959,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra NetworkVO network = _networksDao.findById(networkId); NetworkGuru guru = AdapterBase.getAdapterByName(networkGurus, network.getGuruName()); if (isNetworkImplemented(network)) { - s_logger.debug("Network id=" + networkId + " is already implemented"); + logger.debug("Network id=" + networkId + " is already implemented"); implemented.set(guru, network); return implemented; } @@ -975,19 +973,19 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra throw ex; } - if (s_logger.isDebugEnabled()) { - s_logger.debug("Lock is acquired for network id " + networkId + " as a part of network implement"); + if (logger.isDebugEnabled()) { + logger.debug("Lock is acquired for network id " + networkId + " as a part of network implement"); } try { if (isNetworkImplemented(network)) { - s_logger.debug("Network id=" + networkId + " is already implemented"); + logger.debug("Network id=" + networkId + " is already implemented"); implemented.set(guru, network); return implemented; } - if (s_logger.isDebugEnabled()) { - s_logger.debug("Asking " + guru.getName() + " to implement " + network); + if (logger.isDebugEnabled()) { + logger.debug("Asking " + guru.getName() + " to implement " + network); } NetworkOfferingVO offering = _networkOfferingDao.findById(network.getNetworkOfferingId()); @@ -1021,11 +1019,11 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra implemented.set(guru, network); return implemented; } catch (NoTransitionException e) { - s_logger.error(e.getMessage()); + logger.error(e.getMessage()); return null; } finally { if (implemented.first() == null) { - s_logger.debug("Cleaning up because we're unable to implement the network " + network); + logger.debug("Cleaning up because we're unable to implement the network " + network); try { if (isSharedNetworkWithServices(network)) { network.setState(Network.State.Shutdown); @@ -1034,20 +1032,20 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra stateTransitTo(network, Event.OperationFailed); } } catch (NoTransitionException e) { - s_logger.error(e.getMessage()); + logger.error(e.getMessage()); } try { shutdownNetwork(networkId, context, false); } catch (Exception e) { // Don't throw this exception as it would hide the original thrown exception, just log - s_logger.error("Exception caught while shutting down a network as part of a failed implementation", e); + logger.error("Exception caught while shutting down a network as part of a failed implementation", e); } } _networksDao.releaseFromLockTable(networkId); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Lock is released for network id " + networkId + " as a part of network implement"); + if (logger.isDebugEnabled()) { + logger.debug("Lock is released for network id " + networkId + " as a part of network implement"); } } } @@ -1073,13 +1071,13 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra ips = _ipAddressDao.listByAssociatedVpc(network.getVpcId(), true); if (ips.isEmpty()) { Vpc vpc = _vpcMgr.getActiveVpc(network.getVpcId()); - s_logger.debug("Creating a source nat ip for vpc " + vpc); + logger.debug("Creating a source nat ip for vpc " + vpc); _vpcMgr.assignSourceNatIpAddressToVpc(owner, vpc); } } else { ips = _ipAddressDao.listByAssociatedNetwork(network.getId(), true); if (ips.isEmpty()) { - s_logger.debug("Creating a source nat ip for network " + network); + logger.debug("Creating a source nat ip for network " + network); _ipAddrMgr.assignSourceNatIpAddressToGuestNetwork(owner, network); } } @@ -1097,8 +1095,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra + network.getPhysicalNetworkId()); } - if (s_logger.isDebugEnabled()) { - s_logger.debug("Asking " + element.getName() + " to implemenet " + network); + if (logger.isDebugEnabled()) { + logger.debug("Asking " + element.getName() + " to implemenet " + network); } if (!element.implement(network, offering, dest, context)) { @@ -1117,9 +1115,9 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra try { // reapply all the firewall/staticNat/lb rules - s_logger.debug("Reprogramming network " + network + " as a part of network implement"); + logger.debug("Reprogramming network " + network + " as a part of network implement"); if (!reprogramNetworkRules(network.getId(), CallContext.current().getCallingAccount(), network)) { - s_logger.warn("Failed to re-program the network as a part of network " + network + " implement"); + logger.warn("Failed to re-program the network as a part of network " + network + " implement"); // see DataCenterVO.java ResourceUnavailableException ex = new ResourceUnavailableException("Unable to apply network rules as a part of network " + network + " implement", DataCenter.class, network.getDataCenterId()); @@ -1129,7 +1127,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra for (NetworkElement element : networkElements) { if ((element instanceof AggregatedCommandExecutor) && (providersToImplement.contains(element.getProvider()))) { if (!((AggregatedCommandExecutor)element).completeAggregatedExecution(network, dest)) { - s_logger.warn("Failed to re-program the network as a part of network " + network + " implement due to aggregated commands execution failure!"); + logger.warn("Failed to re-program the network as a part of network " + network + " implement due to aggregated commands execution failure!"); // see DataCenterVO.java ResourceUnavailableException ex = new ResourceUnavailableException("Unable to apply network rules as a part of network " + network + " implement", DataCenter.class, network.getDataCenterId()); @@ -1161,51 +1159,51 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra _firewallMgr.applyDefaultEgressFirewallRule(network.getId(), offering.getEgressDefaultPolicy(), true); } if (!_firewallMgr.applyFirewallRules(firewallEgressRulesToApply, false, caller)) { - s_logger.warn("Failed to reapply firewall Egress rule(s) as a part of network id=" + networkId + " restart"); + logger.warn("Failed to reapply firewall Egress rule(s) as a part of network id=" + networkId + " restart"); success = false; } // associate all ip addresses if (!_ipAddrMgr.applyIpAssociations(network, false)) { - s_logger.warn("Failed to apply ip addresses as a part of network id" + networkId + " restart"); + logger.warn("Failed to apply ip addresses as a part of network id" + networkId + " restart"); success = false; } // apply static nat if (!_rulesMgr.applyStaticNatsForNetwork(networkId, false, caller)) { - s_logger.warn("Failed to apply static nats a part of network id" + networkId + " restart"); + logger.warn("Failed to apply static nats a part of network id" + networkId + " restart"); success = false; } // apply firewall rules List<FirewallRuleVO> firewallIngressRulesToApply = _firewallDao.listByNetworkPurposeTrafficType(networkId, Purpose.Firewall, FirewallRule.TrafficType.Ingress); if (!_firewallMgr.applyFirewallRules(firewallIngressRulesToApply, false, caller)) { - s_logger.warn("Failed to reapply Ingress firewall rule(s) as a part of network id=" + networkId + " restart"); + logger.warn("Failed to reapply Ingress firewall rule(s) as a part of network id=" + networkId + " restart"); success = false; } // apply port forwarding rules if (!_rulesMgr.applyPortForwardingRulesForNetwork(networkId, false, caller)) { - s_logger.warn("Failed to reapply port forwarding rule(s) as a part of network id=" + networkId + " restart"); + logger.warn("Failed to reapply port forwarding rule(s) as a part of network id=" + networkId + " restart"); success = false; } // apply static nat rules if (!_rulesMgr.applyStaticNatRulesForNetwork(networkId, false, caller)) { - s_logger.warn("Failed to reapply static nat rule(s) as a part of network id=" + networkId + " restart"); + logger.warn("Failed to reapply static nat rule(s) as a part of network id=" + networkId + " restart"); success = false; } // apply public load balancer rules if (!_lbMgr.applyLoadBalancersForNetwork(networkId, Scheme.Public)) { - s_logger.warn("Failed to reapply Public load balancer rules as a part of network id=" + networkId + " restart"); + logger.warn("Failed to reapply Public load balancer rules as a part of network id=" + networkId + " restart"); success = false; } // apply internal load balancer rules if (!_lbMgr.applyLoadBalancersForNetwork(networkId, Scheme.Internal)) { - s_logger.warn("Failed to reapply internal load balancer rules as a part of network id=" + networkId + " restart"); + logger.warn("Failed to reapply internal load balancer rules as a part of network id=" + networkId + " restart"); success = false; } @@ -1215,7 +1213,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra for (RemoteAccessVpn vpn : vpnsToReapply) { // Start remote access vpn per ip if (_vpnMgr.startRemoteAccessVpn(vpn.getServerAddressId(), false) == null) { - s_logger.warn("Failed to reapply vpn rules as a part of network id=" + networkId + " restart"); + logger.warn("Failed to reapply vpn rules as a part of network id=" + networkId + " restart"); success = false; } } @@ -1223,7 +1221,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra //apply network ACLs if (!_networkACLMgr.applyACLToNetwork(networkId)) { - s_logger.warn("Failed to reapply network ACLs as a part of of network id=" + networkId + " restart"); + logger.warn("Failed to reapply network ACLs as a part of of network id=" + networkId + " restart"); success = false; } @@ -1263,7 +1261,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra _nicDao.update(nic.getId(), nic); if (nic.getVmType() == VirtualMachine.Type.User) { - s_logger.debug("Changing active number of nics for network id=" + networkId + " on " + count); + logger.debug("Changing active number of nics for network id=" + networkId + " on " + count); _networksDao.changeActiveNicsBy(networkId, count); } @@ -1297,7 +1295,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra for (NicVO nic : nics) { Pair<NetworkGuru, NetworkVO> implemented = implementNetwork(nic.getNetworkId(), dest, context, vmProfile.getVirtualMachine().getType() == Type.DomainRouter); if (implemented == null || implemented.first() == null) { - s_logger.warn("Failed to implement network id=" + nic.getNetworkId() + " as a part of preparing nic id=" + nic.getId()); + logger.warn("Failed to implement network id=" + nic.getNetworkId() + " as a part of preparing nic id=" + nic.getId()); throw new CloudRuntimeException("Failed to implement network id=" + nic.getNetworkId() + " as a part preparing nic id=" + nic.getId()); } @@ -1363,8 +1361,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra throw new CloudRuntimeException("Service provider " + element.getProvider().getName() + " either doesn't exist or is not enabled in physical network id: " + network.getPhysicalNetworkId()); } - if (s_logger.isDebugEnabled()) { - s_logger.debug("Asking " + element.getName() + " to prepare for " + nic); + if (logger.isDebugEnabled()) { + logger.debug("Asking " + element.getName() + " to prepare for " + nic); } if (!prepareElement(element, network, profile, vmProfile, dest, context)) { throw new InsufficientAddressCapacityException("unable to configure the dhcp service, due to insufficiant address capacity", Network.class, network.getId()); @@ -1395,7 +1393,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra _networkModel.getNetworkTag(vm.getHypervisorType(), network)); if (guru instanceof NetworkMigrationResponder) { if (!((NetworkMigrationResponder)guru).prepareMigration(profile, network, vm, dest, context)) { - s_logger.error("NetworkGuru " + guru + " prepareForMigration failed."); // XXX: Transaction error + logger.error("NetworkGuru " + guru + " prepareForMigration failed."); // XXX: Transaction error } } List<Provider> providersToImplement = getNetworkProviders(network.getId()); @@ -1407,7 +1405,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } if (element instanceof NetworkMigrationResponder) { if (!((NetworkMigrationResponder)element).prepareMigration(profile, network, vm, dest, context)) { - s_logger.error("NetworkElement " + element + " prepareForMigration failed."); // XXX: Transaction error + logger.error("NetworkElement " + element + " prepareForMigration failed."); // XXX: Transaction error } } } @@ -1439,7 +1437,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vm.getHypervisorType(), network)); if(guru instanceof NetworkMigrationResponder){ if(!((NetworkMigrationResponder) guru).prepareMigration(profile, network, vm, dest, context)){ - s_logger.error("NetworkGuru "+guru+" prepareForMigration failed."); // XXX: Transaction error + logger.error("NetworkGuru "+guru+" prepareForMigration failed."); // XXX: Transaction error } } List<Provider> providersToImplement = getNetworkProviders(network.getId()); @@ -1450,7 +1448,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } if(element instanceof NetworkMigrationResponder){ if(!((NetworkMigrationResponder) element).prepareMigration(profile, network, vm, dest, context)){ - s_logger.error("NetworkElement "+element+" prepareForMigration failed."); // XXX: Transaction error + logger.error("NetworkElement "+element+" prepareForMigration failed."); // XXX: Transaction error } } } @@ -1471,7 +1469,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra if(nic == null && !addedURIs.contains(broadcastUri.toString())){ //Nic details are not available in DB //Create nic profile for migration - s_logger.debug("Creating nic profile for migration. BroadcastUri: "+broadcastUri.toString()+" NetworkId: "+ntwkId+" Vm: "+vm.getId()); + logger.debug("Creating nic profile for migration. BroadcastUri: "+broadcastUri.toString()+" NetworkId: "+ntwkId+" Vm: "+vm.getId()); NetworkVO network = _networksDao.findById(ntwkId); Integer networkRate = _networkModel.getNetworkRate(network.getId(), vm.getId()); NetworkGuru guru = AdapterBase.getAdapterByName(networkGurus, network.getGuruName()); @@ -1638,8 +1636,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra List<Provider> providersToImplement = getNetworkProviders(network.getId()); for (NetworkElement element : networkElements) { if (providersToImplement.contains(element.getProvider())) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Asking " + element.getName() + " to release " + profile); + if (logger.isDebugEnabled()) { + logger.debug("Asking " + element.getName() + " to release " + profile); } //NOTE: Context appear to never be used in release method //implementations. Consider removing it from interface Element @@ -1651,8 +1649,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra @Override public void cleanupNics(VirtualMachineProfile vm) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Cleaning network for vm: " + vm.getId()); + if (logger.isDebugEnabled()) { + logger.debug("Cleaning network for vm: " + vm.getId()); } List<NicVO> nics = _nicDao.listByVmId(vm.getId()); @@ -1674,7 +1672,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra try { releaseNic(vm, nic.getId()); } catch (Exception ex) { - s_logger.warn("Failed to release nic: " + nic.toString() + " as part of remove operation due to", ex); + logger.warn("Failed to release nic: " + nic.toString() + " as part of remove operation due to", ex); } } @@ -1692,15 +1690,15 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra List<Provider> providersToImplement = getNetworkProviders(network.getId()); for (NetworkElement element : networkElements) { if (providersToImplement.contains(element.getProvider())) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Asking " + element.getName() + " to release " + nic); + if (logger.isDebugEnabled()) { + logger.debug("Asking " + element.getName() + " to release " + nic); } try { element.release(network, profile, vm, null); } catch (ConcurrentOperationException ex) { - s_logger.warn("release failed during the nic " + nic.toString() + " removeNic due to ", ex); + logger.warn("release failed during the nic " + nic.toString() + " removeNic due to ", ex); } catch (ResourceUnavailableException ex) { - s_logger.warn("release failed during the nic " + nic.toString() + " removeNic due to ", ex); + logger.warn("release failed during the nic " + nic.toString() + " removeNic due to ", ex); } } } @@ -1723,10 +1721,10 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra guru.deallocate(network, profile, vm); _nicDao.remove(nic.getId()); - s_logger.debug("Removed nic id=" + nic.getId()); + logger.debug("Removed nic id=" + nic.getId()); //remove the secondary ip addresses corresponding to to this nic if (!removeVmSecondaryIpsOfNic(nic.getId())) { - s_logger.debug("Removing nic " + nic.getId() + " secondary ip addreses failed"); + logger.debug("Removing nic " + nic.getId() + " secondary ip addreses failed"); } } @@ -1765,12 +1763,12 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } }); if (!dhcpServiceProvider.removeDhcpSupportForSubnet(network)) { - s_logger.warn("Failed to remove the ip alias on the router, marking it as removed in db and freed the allocated ip " + ipAlias.getIp4Address()); + logger.warn("Failed to remove the ip alias on the router, marking it as removed in db and freed the allocated ip " + ipAlias.getIp4Address()); } } } catch (ResourceUnavailableException e) { //failed to remove the dhcpconfig on the router. - s_logger.info("Unable to delete the ip alias due to unable to contact the virtualrouter."); + logger.info("Unable to delete the ip alias due to unable to contact the virtualrouter."); } } @@ -1793,7 +1791,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra final NetworkOfferingVO ntwkOff = _networkOfferingDao.findById(networkOfferingId); // this method supports only guest network creation if (ntwkOff.getTrafficType() != TrafficType.Guest) { - s_logger.warn("Only guest networks can be created using this method"); + logger.warn("Only guest networks can be created using this method"); return null; } @@ -2091,12 +2089,12 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra public boolean shutdownNetwork(final long networkId, ReservationContext context, boolean cleanupElements) { NetworkVO network = _networksDao.findById(networkId); if (network.getState() == Network.State.Allocated) { - s_logger.debug("Network is already shutdown: " + network); + logger.debug("Network is already shutdown: " + network); return true; } if (network.getState() != Network.State.Implemented && network.getState() != Network.State.Shutdown) { - s_logger.debug("Network is not implemented: " + network); + logger.debug("Network is not implemented: " + network); return false; } @@ -2104,20 +2102,20 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra //do global lock for the network network = _networksDao.acquireInLockTable(networkId, NetworkLockTimeout.value()); if (network == null) { - s_logger.warn("Unable to acquire lock for the network " + network + " as a part of network shutdown"); + logger.warn("Unable to acquire lock for the network " + network + " as a part of network shutdown"); return false; } - if (s_logger.isDebugEnabled()) { - s_logger.debug("Lock is acquired for network " + network + " as a part of network shutdown"); + if (logger.isDebugEnabled()) { + logger.debug("Lock is acquired for network " + network + " as a part of network shutdown"); } if (network.getState() == Network.State.Allocated) { - s_logger.debug("Network is already shutdown: " + network); + logger.debug("Network is already shutdown: " + network); return true; } if (network.getState() != Network.State.Implemented && network.getState() != Network.State.Shutdown) { - s_logger.debug("Network is not implemented: " + network); + logger.debug("Network is not implemented: " + network); return false; } @@ -2142,8 +2140,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra boolean result = false; if (success) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Network id=" + networkId + " is shutdown successfully, cleaning up corresponding resources now."); + if (logger.isDebugEnabled()) { + logger.debug("Network id=" + networkId + " is shutdown successfully, cleaning up corresponding resources now."); } NetworkGuru guru = AdapterBase.getAdapterByName(networkGurus, networkFinal.getGuruName()); NetworkProfile profile = convertNetworkToNetworkProfile(networkFinal.getId()); @@ -2182,8 +2180,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } finally { if (network != null) { _networksDao.releaseFromLockTable(network.getId()); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Lock is released for network " + network + " as a part of network shutdown"); + if (logger.isDebugEnabled()) { + logger.debug("Lock is released for network " + network + " as a part of network shutdown"); } } } @@ -2210,11 +2208,11 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra cleanupResult = shutdownNetworkResources(network.getId(), context.getAccount(), context.getCaller().getId()); } } catch (Exception ex) { - s_logger.warn("shutdownNetworkRules failed during the network " + network + " shutdown due to ", ex); + logger.warn("shutdownNetworkRules failed during the network " + network + " shutdown due to ", ex); } finally { // just warn the administrator that the network elements failed to shutdown if (!cleanupResult) { - s_logger.warn("Failed to cleanup network id=" + network.getId() + " resources as a part of shutdownNetwork"); + logger.warn("Failed to cleanup network id=" + network.getId() + " resources as a part of shutdownNetwork"); } } @@ -2223,21 +2221,21 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra for (NetworkElement element : networkElements) { if (providersToShutdown.contains(element.getProvider())) { try { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Sending network shutdown to " + element.getName()); + if (logger.isDebugEnabled()) { + logger.debug("Sending network shutdown to " + element.getName()); } if (!element.shutdown(network, context, cleanupElements)) { - s_logger.warn("Unable to complete shutdown of the network elements due to element: " + element.getName()); + logger.warn("Unable to complete shutdown of the network elements due to element: " + element.getName()); success = false; } } catch (ResourceUnavailableException e) { - s_logger.warn("Unable to complete shutdown of the network elements due to element: " + element.getName(), e); + logger.warn("Unable to complete shutdown of the network elements due to element: " + element.getName(), e); success = false; } catch (ConcurrentOperationException e) { - s_logger.warn("Unable to complete shutdown of the network elements due to element: " + element.getName(), e); + logger.warn("Unable to complete shutdown of the network elements due to element: " + element.getName(), e); success = false; } catch (Exception e) { - s_logger.warn("Unable to complete shutdown of the network elements due to element: " + element.getName(), e); + logger.warn("Unable to complete shutdown of the network elements due to element: " + element.getName(), e); success = false; } } @@ -2252,7 +2250,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra NetworkVO network = _networksDao.findById(networkId); if (network == null) { - s_logger.debug("Unable to find network with id: " + networkId); + logger.debug("Unable to find network with id: " + networkId); return false; } @@ -2261,7 +2259,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra for (UserVmVO vm : userVms) { if (!(vm.getState() == VirtualMachine.State.Expunging && vm.getRemoved() != null)) { - s_logger.warn("Can't delete the network, not all user vms are expunged. Vm " + vm + " is in " + vm.getState() + " state"); + logger.warn("Can't delete the network, not all user vms are expunged. Vm " + vm + " is in " + vm.getState() + " state"); return false; } } @@ -2269,7 +2267,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra // Don't allow to delete network via api call when it has vms assigned to it int nicCount = getActiveNicsInNetwork(networkId); if (nicCount > 0) { - s_logger.debug("The network id=" + networkId + " has active Nics, but shouldn't."); + logger.debug("The network id=" + networkId + " has active Nics, but shouldn't."); // at this point we have already determined that there are no active user vms in network // if the op_networks table shows active nics, it's a bug in releasing nics updating op_networks _networksDao.changeActiveNicsBy(networkId, (-1 * nicCount)); @@ -2280,7 +2278,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra if (zone.getNetworkType() == NetworkType.Basic) { List<VMInstanceVO> systemVms = _vmDao.listNonRemovedVmsByTypeAndNetwork(network.getId(), Type.ConsoleProxy, Type.SecondaryStorageVm); if (systemVms != null && !systemVms.isEmpty()) { - s_logger.warn("Can't delete the network, not all consoleProxy/secondaryStorage vms are expunged"); + logger.warn("Can't delete the network, not all consoleProxy/secondaryStorage vms are expunged"); return false; } } @@ -2291,13 +2289,13 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra // get updated state for the network network = _networksDao.findById(networkId); if (network.getState() != Network.State.Allocated && network.getState() != Network.State.Setup && !forced) { - s_logger.debug("Network is not not in the correct state to be destroyed: " + network.getState()); + logger.debug("Network is not not in the correct state to be destroyed: " + network.getState()); return false; } boolean success = true; if (!cleanupNetworkResources(networkId, callerAccount, context.getCaller().getId())) { - s_logger.warn("Unable to delete network id=" + networkId + ": failed to cleanup network resources"); + logger.warn("Unable to delete network id=" + networkId + ": failed to cleanup network resources"); return false; } @@ -2306,30 +2304,30 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra for (NetworkElement element : networkElements) { if (providersToDestroy.contains(element.getProvider())) { try { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Sending destroy to " + element); + if (logger.isDebugEnabled()) { + logger.debug("Sending destroy to " + element); } if (!element.destroy(network, context)) { success = false; - s_logger.warn("Unable to complete destroy of the network: failed to destroy network element " + element.getName()); + logger.warn("Unable to complete destroy of the network: failed to destroy network element " + element.getName()); } } catch (ResourceUnavailableException e) { - s_logger.warn("Unable to complete destroy of the network due to element: " + element.getName(), e); + logger.warn("Unable to complete destroy of the network due to element: " + element.getName(), e); success = false; } catch (ConcurrentOperationException e) { - s_logger.warn("Unable to complete destroy of the network due to element: " + element.getName(), e); + logger.warn("Unable to complete destroy of the network due to element: " + element.getName(), e); success = false; } catch (Exception e) { - s_logger.warn("Unable to complete destroy of the network due to element: " + element.getName(), e); + logger.warn("Unable to complete destroy of the network due to element: " + element.getName(), e); success = false; } } } if (success) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Network id=" + networkId + " is destroyed successfully, cleaning up corresponding resources now."); + if (logger.isDebugEnabled()) { + logger.debug("Network id=" + networkId + " is destroyed successfully, cleaning up corresponding resources now."); } final NetworkVO networkFinal = network; @@ -2342,14 +2340,14 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra guru.trash(networkFinal, _networkOfferingDao.findById(networkFinal.getNetworkOfferingId())); if (!deleteVlansInNetwork(networkFinal.getId(), context.getCaller().getId(), callerAccount)) { - s_logger.warn("Failed to delete network " + networkFinal + "; was unable to cleanup corresponding ip ranges"); + logger.warn("Failed to delete network " + networkFinal + "; was unable to cleanup corresponding ip ranges"); throw new CloudRuntimeException("Failed to delete network " + networkFinal + "; was unable to cleanup corresponding ip ranges"); } else { // commit transaction only when ips and vlans for the network are released successfully try { stateTransitTo(networkFinal, Event.DestroyNetwork); } catch (NoTransitionException e) { - s_logger.debug(e.getMessage()); + logger.debug(e.getMessage()); } if (_networksDao.remove(networkFinal.getId())) { NetworkDomainVO networkDomain = _networkDomainDao.getDomainNetworkMapByNetworkId(networkFinal.getId()); @@ -2376,7 +2374,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } return true; } catch (CloudRuntimeException e) { - s_logger.error("Failed to delete network", e); + logger.error("Failed to delete network", e); return false; } } @@ -2398,7 +2396,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra boolean result = true; for (VlanVO vlan : publicVlans) { if (!_configMgr.deleteVlanAndPublicIpRange(userId, vlan.getId(), callerAccount)) { - s_logger.warn("Failed to delete vlan " + vlan.getId() + ");"); + logger.warn("Failed to delete vlan " + vlan.getId() + ");"); result = false; } } @@ -2406,11 +2404,11 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra //cleanup private vlans int privateIpAllocCount = _privateIpDao.countAllocatedByNetworkId(networkId); if (privateIpAllocCount > 0) { - s_logger.warn("Can't delete Private ip range for network " + networkId + " as it has allocated ip addresses"); + logger.warn("Can't delete Private ip range for network " + networkId + " as it has allocated ip addresses"); result = false; } else { _privateIpDao.deleteByNetworkId(networkId); - s_logger.debug("Deleted ip range for private network id=" + networkId); + logger.debug("Deleted ip range for private network id=" + networkId); } return result; } @@ -2447,13 +2445,13 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra Long time = _lastNetworkIdsToFree.remove(networkId); if (time == null) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("We found network " + networkId + " to be free for the first time. Adding it to the list: " + currentTime); + if (logger.isDebugEnabled()) { + logger.debug("We found network " + networkId + " to be free for the first time. Adding it to the list: " + currentTime); } stillFree.put(networkId, currentTime); } else if (time > (currentTime - NetworkGcWait.value())) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Network " + networkId + " is still free but it's not time to shutdown yet: " + time); + if (logger.isDebugEnabled()) { + logger.debug("Network " + networkId + " is still free but it's not time to shutdown yet: " + time); } stillFree.put(networkId, time); } else { @@ -2469,7 +2467,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra // If network is removed, unset gc flag for it if (_networksDao.findById(networkId) == null) { - s_logger.debug("Network id=" + networkId + " is removed, so clearing up corresponding gc check"); + logger.debug("Network id=" + networkId + " is removed, so clearing up corresponding gc check"); _networksDao.clearCheckForGc(networkId); } else { try { @@ -2481,12 +2479,12 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra shutdownNetwork(networkId, context, false); } catch (Exception e) { - s_logger.warn("Unable to shutdown network: " + networkId); + logger.warn("Unable to shutdown network: " + networkId); } } } } catch (Exception e) { - s_logger.warn("Caught exception while running network gc: ", e); + logger.warn("Caught exception while running network gc: ", e); } } } @@ -2504,10 +2502,10 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } // implement the network - s_logger.debug("Starting network " + network + "..."); + logger.debug("Starting network " + network + "..."); Pair<NetworkGuru, NetworkVO> implementedNetwork = implementNetwork(networkId, dest, context); if (implementedNetwork== null || implementedNetwork.first() == null) { - s_logger.warn("Failed to start the network " + network); + logger.warn("Failed to start the network " + network); return false; } else { return true; @@ -2520,27 +2518,27 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra NetworkVO network = _networksDao.findById(networkId); - s_logger.debug("Restarting network " + networkId + "..."); + logger.debug("Restarting network " + networkId + "..."); ReservationContext context = new ReservationContextImpl(null, null, callerUser, callerAccount); if (cleanup) { // shutdown the network - s_logger.debug("Shutting down the network id=" + networkId + " as a part of network restart"); + logger.debug("Shutting down the network id=" + networkId + " as a part of network restart"); if (!shutdownNetworkElementsAndResources(context, true, network)) { - s_logger.debug("Failed to shutdown the network elements and resources as a part of network restart: " + network.getState()); + logger.debug("Failed to shutdown the network elements and resources as a part of network restart: " + network.getState()); setRestartRequired(network, true); return false; } } else { - s_logger.debug("Skip the shutting down of network id=" + networkId); + logger.debug("Skip the shutting down of network id=" + networkId); } // implement the network elements and rules again DeployDestination dest = new DeployDestination(_dcDao.findById(network.getDataCenterId()), null, null, null); - s_logger.debug("Implementing the network " + network + " elements and resources as a part of network restart"); + logger.debug("Implementing the network " + network + " elements and resources as a part of network restart"); NetworkOfferingVO offering = _networkOfferingDao.findById(network.getNetworkOfferingId()); try { @@ -2548,13 +2546,13 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra setRestartRequired(network, true); return true; } catch (Exception ex) { - s_logger.warn("Failed to implement network " + network + " elements and resources as a part of network restart due to ", ex); + logger.warn("Failed to implement network " + network + " elements and resources as a part of network restart due to ", ex); return false; } } private void setRestartRequired(NetworkVO network, boolean restartRequired) { - s_logger.debug("Marking network " + network + " with restartRequired=" + restartRequired); + logger.debug("Marking network " + network + " with restartRequired=" + restartRequired); network.setRestartRequired(restartRequired); _networksDao.update(network.getId(), network); } @@ -2578,7 +2576,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra String passwordProvider = _ntwkSrvcDao.getProviderForServiceInNetwork(network.getId(), Service.UserData); if (passwordProvider == null) { - s_logger.debug("Network " + network + " doesn't support service " + Service.UserData.getName()); + logger.debug("Network " + network + " doesn't support service " + Service.UserData.getName()); return null; } @@ -2590,7 +2588,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra String SSHKeyProvider = _ntwkSrvcDao.getProviderForServiceInNetwork(network.getId(), Service.UserData); if (SSHKeyProvider == null) { - s_logger.debug("Network " + network + " doesn't support service " + Service.UserData.getName()); + logger.debug("Network " + network + " doesn't support service " + Service.UserData.getName()); return null; } @@ -2602,7 +2600,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra String DhcpProvider = _ntwkSrvcDao.getProviderForServiceInNetwork(network.getId(), Service.Dhcp); if (DhcpProvider == null) { - s_logger.debug("Network " + network + " doesn't support service " + Service.Dhcp.getName()); + logger.debug("Network " + network + " doesn't support service " + Service.Dhcp.getName()); return null; } @@ -2677,51 +2675,51 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra //remove all PF/Static Nat rules for the network try { if (_rulesMgr.revokeAllPFStaticNatRulesForNetwork(networkId, callerUserId, caller)) { - s_logger.debug("Successfully cleaned up portForwarding/staticNat rules for network id=" + networkId); + logger.debug("Successfully cleaned up portForwarding/staticNat rules for network id=" + networkId); } else { success = false; - s_logger.warn("Failed to release portForwarding/StaticNat rules as a part of network id=" + networkId + " cleanup"); + logger.warn("Failed to release portForwarding/StaticNat rules as a part of network id=" + networkId + " cleanup"); } } catch (ResourceUnavailableException ex) { success = false; // shouldn't even come here as network is being cleaned up after all network elements are shutdown - s_logger.warn("Failed to release portForwarding/StaticNat rules as a part of network id=" + networkId + " cleanup due to resourceUnavailable ", ex); + logger.warn("Failed to release portForwarding/StaticNat rules as a part of network id=" + networkId + " cleanup due to resourceUnavailable ", ex); } //remove all LB rules for the network if (_lbMgr.removeAllLoadBalanacersForNetwork(networkId, caller, callerUserId)) { - s_logger.debug("Successfully cleaned up load balancing rules for network id=" + networkId); + logger.debug("Successfully cleaned up load balancing rules for network id=" + networkId); } else { // shouldn't even come here as network is being cleaned up after all network elements are shutdown success = false; - s_logger.warn("Failed to cleanup LB rules as a part of network id=" + networkId + " cleanup"); + logger.warn("Failed to cleanup LB rules as a part of network id=" + networkId + " cleanup"); } //revoke all firewall rules for the network try { if (_firewallMgr.revokeAllFirewallRulesForNetwork(networkId, callerUserId, caller)) { - s_logger.debug("Successfully cleaned up firewallRules rules for network id=" + networkId); + logger.debug("Successfully cleaned up firewallRules rules for network id=" + networkId); } else { success = false; - s_logger.warn("Failed to cleanup Firewall rules as a part of network id=" + networkId + " cleanup"); + logger.warn("Failed to cleanup Firewall rules as a part of network id=" + networkId + " cleanup"); } } catch (ResourceUnavailableException ex) { success = false; // shouldn't even come here as network is being cleaned up after all network elements are shutdown - s_logger.warn("Failed to cleanup Firewall rules as a part of network id=" + networkId + " cleanup due to resourceUnavailable ", ex); + logger.warn("Failed to cleanup Firewall rules as a part of network id=" + networkId + " cleanup due to resourceUnavailable ", ex); } //revoke all network ACLs for network try { if (_networkACLMgr.revokeACLItemsForNetwork(networkId)) { - s_logger.debug("Successfully cleaned up NetworkACLs for network id=" + networkId); + logger.debug("Successfully cleaned up NetworkACLs for network id=" + networkId); } else { success = false; - s_logger.warn("Failed to cleanup NetworkACLs as a part of network id=" + networkId + " cleanup"); + logger.warn("Failed to cleanup NetworkACLs as a part of network id=" + networkId + " cleanup"); } } catch (ResourceUnavailableException ex) { success = false; - s_logger.warn("Failed to cleanup Network ACLs as a part of network id=" + networkId + " cleanup due to resourceUnavailable ", ex); + logger.warn("Failed to cleanup Network ACLs as a part of network id=" + networkId + " cleanup due to resourceUnavailable ", ex); } //release all ip addresses @@ -2736,7 +2734,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra // so as part of network clean up just break IP association with guest network ipToRelease.setAssociatedWithNetworkId(null); _ipAddressDao.update(ipToRelease.getId(), ipToRelease); - s_logger.debug("Portable IP address " + ipToRelease + " is no longer associated with any network"); + logger.debug("Portable IP address " + ipToRelease + " is no longer associated with any network"); } } else { _vpcMgr.unassignIPFromVpcNetwork(ipToRelease.getId(), network.getId()); @@ -2745,7 +2743,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra try { if (!_ipAddrMgr.applyIpAssociations(network, true)) { - s_logger.warn("Unable to apply ip address associations for " + network); + logger.warn("Unable to apply ip address associations for " + network); success = false; } } catch (ResourceUnavailableException e) { @@ -2762,34 +2760,34 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra // Mark all PF rules as revoked and apply them on the backend (not in the DB) List<PortForwardingRuleVO> pfRules = _portForwardingRulesDao.listByNetwork(networkId); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Releasing " + pfRules.size() + " port forwarding rules for network id=" + networkId + " as a part of shutdownNetworkRules"); + if (logger.isDebugEnabled()) { + logger.debug("Releasing " + pfRules.size() + " port forwarding rules for network id=" + networkId + " as a part of shutdownNetworkRules"); } for (PortForwardingRuleVO pfRule : pfRules) { - s_logger.trace("Marking pf rule " + pfRule + " with Revoke state"); + logger.trace("Marking pf rule " + pfRule + " with Revoke state"); pfRule.setState(FirewallRule.State.Revoke); } try { if (!_firewallMgr.applyRules(pfRules, true, false)) { - s_logger.warn("Failed to cleanup pf rules as a part of shutdownNetworkRules"); + logger.warn("Failed to cleanup pf rules as a part of shutdownNetworkRules"); success = false; } } catch (ResourceUnavailableException ex) { - s_logger.warn("Failed to cleanup pf rules as a part of shutdownNetworkRules due to ", ex); + logger.warn("Failed to cleanup pf rules as a part of shutdownNetworkRules due to ", ex); success = false; } // Mark all static rules as revoked and apply them on the backend (not in the DB) List<FirewallRuleVO> firewallStaticNatRules = _firewallDao.listByNetworkAndPurpose(networkId, Purpose.StaticNat); List<StaticNatRule> staticNatRules = new ArrayList<StaticNatRule>(); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Releasing " + firewallStaticNatRules.size() + " static nat rules for network id=" + networkId + " as a part of shutdownNetworkRules"); + if (logger.isDebugEnabled()) { + logger.debug("Releasing " + firewallStaticNatRules.size() + " static nat rules for network id=" + networkId + " as a part of shutdownNetworkRules"); } for (FirewallRuleVO firewallStaticNatRule : firewallStaticNatRules) { - s_logger.trace("Marking static nat rule " + firewallStaticNatRule + " with Revoke state"); + logger.trace("Marking static nat rule " + firewallStaticNatRule + " with Revoke state"); IpAddress ip = _ipAddressDao.findById(firewallStaticNatRule.getSourceIpAddressId()); FirewallRuleVO ruleVO = _firewallDao.findById(firewallStaticNatRule.getId()); @@ -2804,58 +2802,58 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra try { if (!_firewallMgr.applyRules(staticNatRules, true, false)) { - s_logger.warn("Failed to cleanup static nat rules as a part of shutdownNetworkRules"); + logger.warn("Failed to cleanup static nat rules as a part of shutdownNetworkRules"); success = false; } } catch (ResourceUnavailableException ex) { - s_logger.warn("Failed to cleanup static nat rules as a part of shutdownNetworkRules due to ", ex); + logger.warn("Failed to cleanup static nat rules as a part of shutdownNetworkRules due to ", ex); success = false; } try { if (!_lbMgr.revokeLoadBalancersForNetwork(networkId, Scheme.Public)) { - s_logger.warn("Failed to cleanup public lb rules as a part of shutdownNetworkRules"); + logger.warn("Failed to cleanup public lb rules as a part of shutdownNetworkRules"); success = false; } } catch (ResourceUnavailableException ex) { - s_logger.warn("Failed to cleanup public lb rules as a part of shutdownNetworkRules due to ", ex); + logger.warn("Failed to cleanup public lb rules as a part of shutdownNetworkRules due to ", ex); success = false; } try { if (!_lbMgr.revokeLoadBalancersForNetwork(networkId, Scheme.Internal)) { - s_logger.warn("Failed to cleanup internal lb rules as a part of shutdownNetworkRules"); + logger.warn("Failed to cleanup internal lb rules as a part of shutdownNetworkRules"); success = false; } } catch (ResourceUnavailableException ex) { - s_logger.warn("Failed to cleanup public lb rules as a part of shutdownNetworkRules due to ", ex); + logger.warn("Failed to cleanup public lb rules as a part of shutdownNetworkRules due to ", ex); success = false; } // revoke all firewall rules for the network w/o applying them on the DB List<FirewallRuleVO> firewallRules = _firewallDao.listByNetworkPurposeTrafficType(networkId, Purpose.Firewall, FirewallRule.TrafficType.Ingress); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Releasing " + firewallRules.size() + " firewall ingress rules for network id=" + networkId + " as a part of shutdownNetworkRules"); + if (logger.isDebugEnabled()) { + logger.debug("Releasing " + firewallRules.size() + " firewall ingress rules for network id=" + networkId + " as a part of shutdownNetworkRules"); } for (FirewallRuleVO firewallRule : firewallRules) { - s_logger.trace("Marking firewall ingress rule " + firewallRule + " with Revoke state"); + logger.trace("Marking firewall ingress rule " + firewallRule + " with Revoke state"); firewallRule.setState(FirewallRule.State.Revoke); } try { if (!_firewallMgr.applyRules(firewallRules, true, false)) { - s_logger.warn("Failed to cleanup firewall ingress rules as a part of shutdownNetworkRules"); + logger.warn("Failed to cleanup firewall ingress rules as a part of shutdownNetworkRules"); success = false; } } catch (ResourceUnavailableException ex) { - s_logger.warn("Failed to cleanup firewall ingress rules as a part of shutdownNetworkRules due to ", ex); + logger.warn("Failed to cleanup firewall ingress rules as a part of shutdownNetworkRules due to ", ex); success = false; } List<FirewallRuleVO> firewallEgressRules = _firewallDao.listByNetworkPurposeTrafficType(networkId, Purpose.Firewall, FirewallRule.TrafficType.Egress); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Releasing " + firewallEgressRules.size() + " firewall egress rules for network id=" + networkId + " as a part of shutdownNetworkRules"); + if (logger.isDebugEnabled()) { + logger.debug("Releasing " + firewallEgressRules.size() + " firewall egress rules for network id=" + networkId + " as a part of shutdownNetworkRules"); } try { @@ -2868,38 +2866,38 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } } catch (ResourceUnavailableException ex) { - s_logger.warn("Failed to cleanup firewall default egress rule as a part of shutdownNetworkRules due to ", ex); + logger.warn("Failed to cleanup firewall default egress rule as a part of shutdownNetworkRules due to ", ex); success = false; } for (FirewallRuleVO firewallRule : firewallEgressRules) { - s_logger.trace("Marking firewall egress rule " + firewallRule + " with Revoke state"); + logger.trace("Marking firewall egress rule " + firewallRule + " with Revoke state"); firewallRule.setState(FirewallRule.State.Revoke); } try { if (!_firewallMgr.applyRules(firewallEgressRules, true, false)) { - s_logger.warn("Failed to cleanup firewall egress rules as a part of shutdownNetworkRules"); + logger.warn("Failed to cleanup firewall egress rules as a part of shutdownNetworkRules"); success = false; } } catch (ResourceUnavailableException ex) { - s_logger.warn("Failed to cleanup firewall egress rules as a part of shutdownNetworkRules due to ", ex); + logger.warn("Failed to cleanup firewall egress rules as a part of shutdownNetworkRules due to ", ex); success = false; } if (network.getVpcId() != null) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Releasing Network ACL Items for network id=" + networkId + " as a part of shutdownNetworkRules"); + if (logger.isDebugEnabled()) { + logger.debug("Releasing Network ACL Items for network id=" + networkId + " as a part of shutdownNetworkRules"); } try { //revoke all Network ACLs for the network w/o applying them in the DB if (!_networkACLMgr.revokeACLItemsForNetwork(networkId)) { - s_logger.warn("Failed to cleanup network ACLs as a part of shutdownNetworkRules"); + logger.warn("Failed to cleanup network ACLs as a part of shutdownNetworkRules"); success = false; } } catch (ResourceUnavailableException ex) { - s_logger.warn("Failed to cleanup network ACLs as a part of shutdownNetworkRules due to ", ex); + logger.warn("Failed to cleanup network ACLs as a part of shutdownNetworkRules due to ", ex); success = false; } @@ -2907,7 +2905,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra //release all static nats for the network if (!_rulesMgr.applyStaticNatForNetwork(networkId, false, caller, true)) { - s_logger.warn("Failed to disable static nats as part of shutdownNetworkRules for network id " + networkId); + logger.warn("Failed to disable static nats as part of shutdownNetworkRules for network id " + networkId); success = false; } @@ -2924,7 +2922,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra try { if (!_ipAddrMgr.applyIpAssociations(network, true, true, publicIpsToRelease)) { - s_logger.warn("Unable to apply ip address associations for " + network + " as a part of shutdownNetworkRules"); + logger.warn("Unable to apply ip address associations for " + network + " as a part of shutdownNetworkRules"); success = false; } } catch (ResourceUnavailableException e) { @@ -2974,8 +2972,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra dcId = dc.getId(); HypervisorType hypervisorType = startup.getHypervisorType(); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Host's hypervisorType is: " + hypervisorType); + if (logger.isDebugEnabled()) { + logger.debug("Host's hypervisorType is: " + hypervisorType); } List<PhysicalNetworkSetupInfo> networkInfoList = new ArrayList<PhysicalNetworkSetupInfo>(); @@ -3003,20 +3001,20 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra } // send the names to the agent - if (s_logger.isDebugEnabled()) { - s_logger.debug("Sending CheckNetworkCommand to check the Network is setup correctly on Agent"); + if (logger.isDebugEnabled()) { + logger.debug("Sending CheckNetworkCommand to check the Network is setup correctly on Agent"); } CheckNetworkCommand nwCmd = new CheckNetworkCommand(networkInfoList); CheckNetworkAnswer answer = (CheckNetworkAnswer)_agentMgr.easySend(hostId, nwCmd); if (answer == null) { - s_logger.warn("Unable to get an answer to the CheckNetworkCommand from agent:" + host.getId()); + logger.warn("Unable to get an answer to the CheckNetworkCommand from agent:" + host.getId()); throw new ConnectionException(true, "Unable to get an answer to the CheckNetworkCommand from agent: " + host.getId()); } if (!answer.getResult()) { - s_logger.warn("Unable to setup agent " + hostId + " due to " + answer.getDetails() ); + logger.warn("Unable to setup agent " + hostId + " due to " + answer.getDetails() ); String msg = "Incorrect Network setup on agent, Reinitialize agent after network names are setup, details : " + answer.getDetails(); _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, dcId, host.getPodId(), msg, msg); throw new ConnectionException(true, msg); @@ -3024,8 +3022,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra if (answer.needReconnect()) { throw new ConnectionException(false, "Reinitialize agent after network setup."); } - if (s_logger.isDebugEnabled()) { - s_logger.debug("Network setup is correct on Agent"); + if (logger.isDebugEnabled()) { + logger.debug("Network setup is correct on Agent"); } return; } @@ -3158,18 +3156,18 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra VMNetworkMapVO vno = new VMNetworkMapVO(vm.getId(), network.getId()); _vmNetworkMapDao.persist(vno); } - s_logger.debug("Nic is allocated successfully for vm " + vm + " in network " + network); + logger.debug("Nic is allocated successfully for vm " + vm + " in network " + network); } //2) prepare nic if (prepare) { Pair<NetworkGuru, NetworkVO> implemented = implementNetwork(nic.getNetworkId(), dest, context, vmProfile.getVirtualMachine().getType() == Type.DomainRouter); if (implemented == null || implemented.first() == null) { - s_logger.warn("Failed to implement network id=" + nic.getNetworkId() + " as a part of preparing nic id=" + nic.getId()); + logger.warn("Failed to implement network id=" + nic.getNetworkId() + " as a part of preparing nic id=" + nic.getId()); throw new CloudRuntimeException("Failed to implement network id=" + nic.getNetworkId() + " as a part preparing nic id=" + nic.getId()); } nic = prepareNic(vmProfile, dest, context, nic.getId(), implemented.second()); - s_logger.debug("Nic is prepared successfully for vm " + vm + " in network " + network); + logger.debug("Nic is prepared successfully for vm " + vm + " in network " + network); } return nic; @@ -3232,18 +3230,18 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra List<Provider> providers = getProvidersForServiceInNetwork(network, service); //Only support one provider now if (providers == null) { - s_logger.error("Cannot find " + service.getName() + " provider for network " + network.getId()); + logger.error("Cannot find " + service.getName() + " provider for network " + network.getId()); return null; } if (providers.size() != 1 && service != Service.Lb) { //support more than one LB providers only - s_logger.error("Found " + providers.size() + " " + service.getName() + " providers for network!" + network.getId()); + logger.error("Found " + providers.size() + " " + service.getName() + " providers for network!" + network.getId()); return null; } for (Provider provider : providers) { NetworkElement element = _networkModel.getElementImplementingProvider(provider.getName()); - s_logger.info("Let " + element.getName() + " handle " + service.getName() + " in network " + network.getId()); + logger.info("Let " + element.getName() + " handle " + service.getName() + " in network " + network.getId()); elements.add(element); } return elements; @@ -3304,7 +3302,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra for (NicSecondaryIpVO ip : ipList) { _nicSecondaryIpDao.remove(ip.getId()); } - s_logger.debug("Revoving nic secondary ip entry ..."); + logger.debug("Revoving nic secondary ip entry ..."); } } });
