http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3818257a/server/src/com/cloud/resource/ResourceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index b450e31..125c3a2 100644 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -46,7 +46,6 @@ import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.utils.identity.ManagementServerNode; import org.apache.commons.lang.ObjectUtils; -import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; @@ -174,7 +173,6 @@ import com.google.gson.Gson; @Component @Local({ResourceManager.class, ResourceService.class}) public class ResourceManagerImpl extends ManagerBase implements ResourceManager, ResourceService, Manager { - private static final Logger s_logger = Logger.getLogger(ResourceManagerImpl.class); Gson _gson; @@ -356,7 +354,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } else { throw new CloudRuntimeException("Unknown resource event:" + event); } - s_logger.debug("Sent resource event " + eventName + " to listener " + l.getClass().getSimpleName()); + logger.debug("Sent resource event " + eventName + " to listener " + l.getClass().getSimpleName()); } } @@ -420,7 +418,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, final Hypervisor.HypervisorType hypervisorType = Hypervisor.HypervisorType.getType(cmd.getHypervisor()); if (hypervisorType == null) { - s_logger.error("Unable to resolve " + cmd.getHypervisor() + " to a valid supported hypervisor type"); + logger.error("Unable to resolve " + cmd.getHypervisor() + " to a valid supported hypervisor type"); throw new InvalidParameterValueException("Unable to resolve " + cmd.getHypervisor() + " to a supported "); } @@ -534,12 +532,12 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } discoverer.postDiscovery(hosts, _nodeId); } - s_logger.info("External cluster has been successfully discovered by " + discoverer.getName()); + logger.info("External cluster has been successfully discovered by " + discoverer.getName()); success = true; return result; } - s_logger.warn("Unable to find the server resources at " + url); + logger.warn("Unable to find the server resources at " + url); throw new DiscoveryException("Unable to add the external cluster"); } finally { if (!success) { @@ -730,7 +728,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } final List<HostVO> hosts = new ArrayList<HostVO>(); - s_logger.info("Trying to add a new host at " + url + " in data center " + dcId); + logger.info("Trying to add a new host at " + url + " in data center " + dcId); boolean isHypervisorTypeSupported = false; for (final Discoverer discoverer : _discoverers) { if (params != null) { @@ -749,7 +747,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } catch (final DiscoveryException e) { throw e; } catch (final Exception e) { - s_logger.info("Exception in host discovery process with discoverer: " + discoverer.getName() + ", skip to another discoverer if there is any"); + logger.info("Exception in host discovery process with discoverer: " + discoverer.getName() + ", skip to another discoverer if there is any"); } processResourceEvent(ResourceListener.EVENT_DISCOVER_AFTER, resources); @@ -767,8 +765,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, for (final HostVO host : kvmHosts) { if (host.getGuid().equalsIgnoreCase(guid)) { if (hostTags != null) { - if (s_logger.isTraceEnabled()) { - s_logger.trace("Adding Host Tags for KVM host, tags: :" + hostTags); + if (logger.isTraceEnabled()) { + logger.trace("Adding Host Tags for KVM host, tags: :" + hostTags); } _hostTagsDao.persist(host.getId(), hostTags); } @@ -791,16 +789,16 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, discoverer.postDiscovery(hosts, _nodeId); } - s_logger.info("server resources successfully discovered by " + discoverer.getName()); + logger.info("server resources successfully discovered by " + discoverer.getName()); return hosts; } } if (!isHypervisorTypeSupported) { final String msg = "Do not support HypervisorType " + hypervisorType + " for " + url; - s_logger.warn(msg); + logger.warn(msg); throw new DiscoveryException(msg); } - s_logger.warn("Unable to find the server resources at " + url); + logger.warn("Unable to find the server resources at " + url); throw new DiscoveryException("Unable to add the host"); } @@ -879,7 +877,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, try { resourceStateTransitTo(host, ResourceState.Event.DeleteHost, _nodeId); } catch (final NoTransitionException e) { - s_logger.debug("Cannot transmit host " + host.getId() + " to Enabled state", e); + logger.debug("Cannot transmit host " + host.getId() + " to Enabled state", e); } // Delete the associated entries in host ref table @@ -904,7 +902,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, storagePool.setClusterId(null); _storagePoolDao.update(poolId, storagePool); _storagePoolDao.remove(poolId); - s_logger.debug("Local storage id=" + poolId + " is removed as a part of host removal id=" + hostId); + logger.debug("Local storage id=" + poolId + " is removed as a part of host removal id=" + hostId); } } @@ -948,8 +946,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, public void doInTransactionWithoutResult(final TransactionStatus status) { final ClusterVO cluster = _clusterDao.lockRow(cmd.getId(), true); if (cluster == null) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Cluster: " + cmd.getId() + " does not even exist. Delete call is ignored."); + if (logger.isDebugEnabled()) { + logger.debug("Cluster: " + cmd.getId() + " does not even exist. Delete call is ignored."); } throw new CloudRuntimeException("Cluster: " + cmd.getId() + " does not exist"); } @@ -958,8 +956,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, final List<HostVO> hosts = listAllHostsInCluster(cmd.getId()); if (hosts.size() > 0) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Cluster: " + cmd.getId() + " still has hosts, can't remove"); + if (logger.isDebugEnabled()) { + logger.debug("Cluster: " + cmd.getId() + " still has hosts, can't remove"); } throw new CloudRuntimeException("Cluster: " + cmd.getId() + " cannot be removed. Cluster still has hosts"); } @@ -968,8 +966,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, // pools final List<StoragePoolVO> storagePools = _storagePoolDao.listPoolsByCluster(cmd.getId()); if (storagePools.size() > 0) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Cluster: " + cmd.getId() + " still has storage pools, can't remove"); + if (logger.isDebugEnabled()) { + logger.debug("Cluster: " + cmd.getId() + " still has storage pools, can't remove"); } throw new CloudRuntimeException("Cluster: " + cmd.getId() + " cannot be removed. Cluster still has storage pools"); } @@ -995,7 +993,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } catch (final CloudRuntimeException e) { throw e; } catch (final Throwable t) { - s_logger.error("Unable to delete cluster: " + cmd.getId(), t); + logger.error("Unable to delete cluster: " + cmd.getId(), t); return false; } } @@ -1011,7 +1009,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, if (hypervisor != null && !hypervisor.isEmpty()) { final Hypervisor.HypervisorType hypervisorType = Hypervisor.HypervisorType.getType(hypervisor); if (hypervisorType == null) { - s_logger.error("Unable to resolve " + hypervisor + " to a valid supported hypervisor type"); + logger.error("Unable to resolve " + hypervisor + " to a valid supported hypervisor type"); throw new InvalidParameterValueException("Unable to resolve " + hypervisor + " to a supported type"); } else { cluster.setHypervisorType(hypervisor); @@ -1027,7 +1025,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, throw new InvalidParameterValueException("Unable to resolve " + clusterType + " to a supported type"); } if (newClusterType == null) { - s_logger.error("Unable to resolve " + clusterType + " to a valid supported cluster type"); + logger.error("Unable to resolve " + clusterType + " to a valid supported cluster type"); throw new InvalidParameterValueException("Unable to resolve " + clusterType + " to a supported type"); } else { cluster.setClusterType(newClusterType); @@ -1043,7 +1041,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, throw new InvalidParameterValueException("Unable to resolve Allocation State '" + allocationState + "' to a supported state"); } if (newAllocationState == null) { - s_logger.error("Unable to resolve " + allocationState + " to a valid supported allocation State"); + logger.error("Unable to resolve " + allocationState + " to a valid supported allocation State"); throw new InvalidParameterValueException("Unable to resolve " + allocationState + " to a supported state"); } else { cluster.setAllocationState(newAllocationState); @@ -1060,7 +1058,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, throw new InvalidParameterValueException("Unable to resolve Managed State '" + managedstate + "' to a supported state"); } if (newManagedState == null) { - s_logger.error("Unable to resolve Managed State '" + managedstate + "' to a supported state"); + logger.error("Unable to resolve Managed State '" + managedstate + "' to a supported state"); throw new InvalidParameterValueException("Unable to resolve Managed State '" + managedstate + "' to a supported state"); } else { doUpdate = true; @@ -1179,7 +1177,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, final HostVO host = _hostDao.findById(hostId); final MaintainAnswer answer = (MaintainAnswer)_agentMgr.easySend(hostId, new MaintainCommand()); if (answer == null || !answer.getResult()) { - s_logger.warn("Unable to send MaintainCommand to host: " + hostId); + logger.warn("Unable to send MaintainCommand to host: " + hostId); return false; } @@ -1187,7 +1185,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, resourceStateTransitTo(host, ResourceState.Event.AdminAskMaintenace, _nodeId); } catch (final NoTransitionException e) { final String err = "Cannot transmit resource state of host " + host.getId() + " to " + ResourceState.Maintenance; - s_logger.debug(err, e); + logger.debug(err, e); throw new CloudRuntimeException(err + e.getMessage()); } @@ -1236,7 +1234,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, final HostVO host = _hostDao.findById(hostId); if (host == null) { - s_logger.debug("Unable to find host " + hostId); + logger.debug("Unable to find host " + hostId); throw new InvalidParameterValueException("Unable to find host with ID: " + hostId + ". Please specify a valid host ID."); } @@ -1277,7 +1275,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } } } catch (final NoTransitionException e) { - s_logger.debug("Cannot transmit host " + host.getId() + "to Maintenance state", e); + logger.debug("Cannot transmit host " + host.getId() + "to Maintenance state", e); } return hostInMaintenance; } @@ -1331,8 +1329,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, final List<String> hostTags = cmd.getHostTags(); if (hostTags != null) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Updating Host Tags to :" + hostTags); + if (logger.isDebugEnabled()) { + logger.debug("Updating Host Tags to :" + hostTags); } _hostTagsDao.persist(hostId, hostTags); } @@ -1480,7 +1478,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, final ResourceStateAdapter adapter = item.getValue(); final String msg = "Dispatching resource state event " + event + " to " + item.getKey(); - s_logger.debug(msg); + logger.debug(msg); if (event == ResourceStateAdapter.Event.CREATE_HOST_VO_FOR_CONNECTED) { result = adapter.createHostVOForConnectedAgent((HostVO)args[0], (StartupCommand[])args[1]); @@ -1501,7 +1499,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, break; } } catch (final UnableDeleteHostException e) { - s_logger.debug("Adapter " + adapter.getName() + " says unable to delete host", e); + logger.debug("Adapter " + adapter.getName() + " says unable to delete host", e); result = new ResourceStateAdapter.DeleteHostAnswer(false, true); } } else { @@ -1527,7 +1525,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, final String cidrSubnet = NetUtils.getCidrSubNet(cidrAddress, cidrSize); final String serverSubnet = NetUtils.getSubNet(serverPrivateIP, serverPrivateNetmask); if (!cidrSubnet.equals(serverSubnet)) { - s_logger.warn("The private ip address of the server (" + serverPrivateIP + ") is not compatible with the CIDR of pod: " + pod.getName() + " and zone: " + + logger.warn("The private ip address of the server (" + serverPrivateIP + ") is not compatible with the CIDR of pod: " + pod.getName() + " and zone: " + dc.getName()); throw new IllegalArgumentException("The private ip address of the server (" + serverPrivateIP + ") is not compatible with the CIDR of pod: " + pod.getName() + " and zone: " + dc.getName()); @@ -1607,7 +1605,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, dcId = Long.parseLong(dataCenter); dc = _dcDao.findById(dcId); } catch (final NumberFormatException e) { - s_logger.debug("Cannot parse " + dataCenter + " into Long."); + logger.debug("Cannot parse " + dataCenter + " into Long."); } } if (dc == null) { @@ -1621,7 +1619,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, final long podId = Long.parseLong(pod); p = _podDao.findById(podId); } catch (final NumberFormatException e) { - s_logger.debug("Cannot parse " + pod + " into Long."); + logger.debug("Cannot parse " + pod + " into Long."); } } /* @@ -1708,12 +1706,12 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, /* Agent goes to Connecting status */ _agentMgr.agentStatusTransitTo(host, Status.Event.AgentConnected, _nodeId); } catch (final Exception e) { - s_logger.debug("Cannot transmit host " + host.getId() + " to Creating state", e); + logger.debug("Cannot transmit host " + host.getId() + " to Creating state", e); _agentMgr.agentStatusTransitTo(host, Status.Event.Error, _nodeId); try { resourceStateTransitTo(host, ResourceState.Event.Error, _nodeId); } catch (final NoTransitionException e1) { - s_logger.debug("Cannot transmit host " + host.getId() + "to Error state", e); + logger.debug("Cannot transmit host " + host.getId() + "to Error state", e); } } @@ -1766,7 +1764,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, try { cmds = resource.initialize(); if (cmds == null) { - s_logger.info("Unable to fully initialize the agent because no StartupCommands are returned"); + logger.info("Unable to fully initialize the agent because no StartupCommands are returned"); return null; } @@ -1779,7 +1777,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } } - if (s_logger.isDebugEnabled()) { + if (logger.isDebugEnabled()) { new Request(-1l, -1l, cmds, true, false).logD("Startup request from directly connected host: ", true); } @@ -1790,7 +1788,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, host = findHostByGuid(firstCmd.getGuidWithoutResource()); } if (host != null && host.getRemoved() == null) { // host already added, no need to add again - s_logger.debug("Found the host " + host.getId() + " by guid: " + firstCmd.getGuid() + ", old host reconnected as new"); + logger.debug("Found the host " + host.getId() + " by guid: " + firstCmd.getGuid() + ", old host reconnected as new"); hostExists = true; // ensures that host status is left unchanged in case of adding same one again return null; } @@ -1803,7 +1801,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, host = _hostDao.findById(host.getId()); } } catch (final Exception e) { - s_logger.warn("Unable to connect due to ", e); + logger.warn("Unable to connect due to ", e); } finally { if (hostExists) { if (cmds != null) { @@ -1832,7 +1830,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, try { cmds = resource.initialize(); if (cmds == null) { - s_logger.info("Unable to fully initialize the agent because no StartupCommands are returned"); + logger.info("Unable to fully initialize the agent because no StartupCommands are returned"); return null; } @@ -1845,7 +1843,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } } - if (s_logger.isDebugEnabled()) { + if (logger.isDebugEnabled()) { new Request(-1l, -1l, cmds, true, false).logD("Startup request from directly connected host: ", true); } @@ -1859,7 +1857,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, // added, no // need to add // again - s_logger.debug("Found the host " + host.getId() + " by guid: " + firstCmd.getGuid() + ", old host reconnected as new"); + logger.debug("Found the host " + host.getId() + " by guid: " + firstCmd.getGuid() + ", old host reconnected as new"); hostExists = true; // ensures that host status is left // unchanged in case of adding same one // again @@ -1903,7 +1901,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } } } catch (final Exception e) { - s_logger.warn("Unable to connect due to ", e); + logger.warn("Unable to connect due to ", e); } finally { if (hostExists) { if (cmds != null) { @@ -1990,7 +1988,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, @Override public HostVO fillRoutingHostVO(final HostVO host, final StartupRoutingCommand ssCmd, final HypervisorType hyType, Map<String, String> details, final List<String> hostTags) { if (host.getPodId() == null) { - s_logger.error("Host " + ssCmd.getPrivateIpAddress() + " sent incorrect pod, pod id is null"); + logger.error("Host " + ssCmd.getPrivateIpAddress() + " sent incorrect pod, pod id is null"); throw new IllegalArgumentException("Host " + ssCmd.getPrivateIpAddress() + " sent incorrect pod, pod id is null"); } @@ -2031,8 +2029,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, throw new CloudRuntimeException("Non-Routing host gets in deleteRoutingHost, id is " + host.getId()); } - if (s_logger.isDebugEnabled()) { - s_logger.debug("Deleting Host: " + host.getId() + " Guid:" + host.getGuid()); + if (logger.isDebugEnabled()) { + logger.debug("Deleting Host: " + host.getId() + " Guid:" + host.getGuid()); } if (forceDestroyStorage) { @@ -2044,12 +2042,12 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, try { final StoragePool pool = _storageSvr.preparePrimaryStorageForMaintenance(storagePool.getId()); if (pool == null) { - s_logger.debug("Failed to set primary storage into maintenance mode"); + logger.debug("Failed to set primary storage into maintenance mode"); throw new UnableDeleteHostException("Failed to set primary storage into maintenance mode"); } } catch (final Exception e) { - s_logger.debug("Failed to set primary storage into maintenance mode, due to: " + e.toString()); + logger.debug("Failed to set primary storage into maintenance mode, due to: " + e.toString()); throw new UnableDeleteHostException("Failed to set primary storage into maintenance mode, due to: " + e.toString()); } } @@ -2060,7 +2058,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, _vmMgr.destroy(vm.getUuid()); } catch (final Exception e) { final String errorMsg = "There was an error Destory the vm: " + vm + " as a part of hostDelete id=" + host.getId(); - s_logger.debug(errorMsg, e); + logger.debug(errorMsg, e); throw new UnableDeleteHostException(errorMsg + "," + e.getMessage()); } } @@ -2074,16 +2072,16 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, // Restart HA enabled vms for (final VMInstanceVO vm : vms) { if (!vm.isHaEnabled() || vm.getState() == State.Stopping) { - s_logger.debug("Stopping vm: " + vm + " as a part of deleteHost id=" + host.getId()); + logger.debug("Stopping vm: " + vm + " as a part of deleteHost id=" + host.getId()); try { _vmMgr.advanceStop(vm.getUuid(), false); } catch (final Exception e) { final String errorMsg = "There was an error stopping the vm: " + vm + " as a part of hostDelete id=" + host.getId(); - s_logger.debug(errorMsg, e); + logger.debug(errorMsg, e); throw new UnableDeleteHostException(errorMsg + "," + e.getMessage()); } } else if (vm.isHaEnabled() && (vm.getState() == State.Running || vm.getState() == State.Starting)) { - s_logger.debug("Scheduling restart for vm: " + vm + " " + vm.getState() + " on the host id=" + host.getId()); + logger.debug("Scheduling restart for vm: " + vm + " " + vm.getState() + " on the host id=" + host.getId()); _haMgr.scheduleRestart(vm, false); } } @@ -2099,7 +2097,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, HostVO host; host = _hostDao.findById(hostId); if (host == null || host.getRemoved() != null) { - s_logger.warn("Unable to find host " + hostId); + logger.warn("Unable to find host " + hostId); return true; } @@ -2117,7 +2115,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, final List<VMInstanceVO> vms = _haMgr.findTakenMigrationWork(); for (final VMInstanceVO vm : vms) { if (vm != null && vm.getHostId() != null && vm.getHostId() == hostId) { - s_logger.info("Unable to cancel migration because the vm is being migrated: " + vm); + logger.info("Unable to cancel migration because the vm is being migrated: " + vm); return false; } } @@ -2131,7 +2129,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, final boolean sshToAgent = Boolean.parseBoolean(_configDao.getValue(Config.KvmSshToAgentEnabled.key())); if (!sshToAgent) { - s_logger.info("Configuration tells us not to SSH into Agents. Please restart the Agent (" + hostId + ") manually"); + logger.info("Configuration tells us not to SSH into Agents. Please restart the Agent (" + hostId + ") manually"); return true; } @@ -2139,12 +2137,12 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, final String password = host.getDetail("password"); final String username = host.getDetail("username"); if (password == null || username == null) { - s_logger.debug("Can't find password/username"); + logger.debug("Can't find password/username"); return false; } final com.trilead.ssh2.Connection connection = SSHCmdHelper.acquireAuthorizedConnection(host.getPrivateIpAddress(), 22, username, password); if (connection == null) { - s_logger.debug("Failed to connect to host: " + host.getPrivateIpAddress()); + logger.debug("Failed to connect to host: " + host.getPrivateIpAddress()); return false; } @@ -2157,7 +2155,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, return true; } catch (final NoTransitionException e) { - s_logger.debug("Cannot transmit host " + host.getId() + "to Enabled state", e); + logger.debug("Cannot transmit host " + host.getId() + "to Enabled state", e); return false; } } @@ -2197,7 +2195,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, private boolean doUmanageHost(final long hostId) { final HostVO host = _hostDao.findById(hostId); if (host == null) { - s_logger.debug("Cannot find host " + hostId + ", assuming it has been deleted, skip umanage"); + logger.debug("Cannot find host " + hostId + ", assuming it has been deleted, skip umanage"); return true; } @@ -2241,7 +2239,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, final UpdateHostPasswordCommand cmd = new UpdateHostPasswordCommand(username, password, hostIpAddress); final Answer answer = _agentMgr.easySend(hostId, cmd); - s_logger.info("Result returned from update host password ==> " + answer.getDetails()); + logger.info("Result returned from update host password ==> " + answer.getDetails()); return answer.getResult(); } @@ -2261,7 +2259,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, return result; } } catch (final AgentUnavailableException e) { - s_logger.error("Agent is not availbale!", e); + logger.error("Agent is not availbale!", e); } if (shouldUpdateHostPasswd) { @@ -2284,7 +2282,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, return result; } } catch (final AgentUnavailableException e) { - s_logger.error("Agent is not availbale!", e); + logger.error("Agent is not availbale!", e); } final boolean shouldUpdateHostPasswd = command.getUpdatePasswdOnHost(); @@ -2311,8 +2309,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, return null; } - if (s_logger.isDebugEnabled()) { - s_logger.debug("Propagating agent change request event:" + event.toString() + " to agent:" + agentId); + if (logger.isDebugEnabled()) { + logger.debug("Propagating agent change request event:" + event.toString() + " to agent:" + agentId); } final Command[] cmds = new Command[1]; cmds[0] = new PropagateResourceEventCommand(agentId, event); @@ -2324,8 +2322,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, final Answer[] answers = _gson.fromJson(AnsStr, Answer[].class); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Result for agent change is " + answers[0].getResult()); + if (logger.isDebugEnabled()) { + logger.debug("Result for agent change is " + answers[0].getResult()); } return answers[0].getResult(); @@ -2335,15 +2333,15 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, public boolean maintenanceFailed(final long hostId) { final HostVO host = _hostDao.findById(hostId); if (host == null) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Cant not find host " + hostId); + if (logger.isDebugEnabled()) { + logger.debug("Cant not find host " + hostId); } return false; } else { try { return resourceStateTransitTo(host, ResourceState.Event.UnableToMigrate, _nodeId); } catch (final NoTransitionException e) { - s_logger.debug("No next resource state for host " + host.getId() + " while current state is " + host.getResourceState() + " with event " + + logger.debug("No next resource state for host " + host.getId() + " while current state is " + host.getResourceState() + " with event " + ResourceState.Event.UnableToMigrate, e); return false; } @@ -2490,7 +2488,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, if (answer == null || !answer.getResult()) { final String msg = "Unable to obtain host " + hostId + " statistics. "; - s_logger.warn(msg); + logger.warn(msg); return null; } else { @@ -2589,8 +2587,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, if(!listAvailableGPUDevice(hostId, groupName, vgpuType).isEmpty()) { return true; } else { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Host ID: "+ hostId +" does not have GPU device available"); + if (logger.isDebugEnabled()) { + logger.debug("Host ID: "+ hostId +" does not have GPU device available"); } return false; } @@ -2620,7 +2618,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } if (answer == null || !answer.getResult()) { final String msg = "Unable to obtain GPU stats for host " + host.getName(); - s_logger.warn(msg); + logger.warn(msg); return null; } else { // now construct the result object @@ -2644,8 +2642,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, final long id = reservationEntry.getId(); final PlannerHostReservationVO hostReservation = _plannerHostReserveDao.lockRow(id, true); if (hostReservation == null) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Host reservation for host: " + hostId + " does not even exist. Release reservartion call is ignored."); + if (logger.isDebugEnabled()) { + logger.debug("Host reservation for host: " + hostId + " does not even exist. Release reservartion call is ignored."); } return false; } @@ -2654,8 +2652,8 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, return true; } - if (s_logger.isDebugEnabled()) { - s_logger.debug("Host reservation for host: " + hostId + " does not even exist. Release reservartion call is ignored."); + if (logger.isDebugEnabled()) { + logger.debug("Host reservation for host: " + hostId + " does not even exist. Release reservartion call is ignored."); } return false; @@ -2664,7 +2662,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } catch (final CloudRuntimeException e) { throw e; } catch (final Throwable t) { - s_logger.error("Unable to release host reservation for host: " + hostId, t); + logger.error("Unable to release host reservation for host: " + hostId, t); return false; } }
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3818257a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java index 1651ad7..4a048a2 100644 --- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java +++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java @@ -30,7 +30,6 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.apache.cloudstack.acl.SecurityChecker.AccessType; @@ -110,7 +109,6 @@ import com.cloud.vm.dao.VMInstanceDao; @Component @Local(value = {ResourceLimitService.class}) public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLimitService { - public static final Logger s_logger = Logger.getLogger(ResourceLimitManagerImpl.class); @Inject private DomainDao _domainDao; @@ -249,7 +247,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim domainResourceLimitMap.put(Resource.ResourceType.primary_storage, Long.parseLong(_configDao.getValue(Config.DefaultMaxDomainPrimaryStorage.key()))); domainResourceLimitMap.put(Resource.ResourceType.secondary_storage, Long.parseLong(_configDao.getValue(Config.DefaultMaxDomainSecondaryStorage.key()))); } catch (NumberFormatException e) { - s_logger.error("NumberFormatException during configuration", e); + logger.error("NumberFormatException during configuration", e); throw new ConfigurationException("Configuration failed due to NumberFormatException, see log for the stacktrace"); } @@ -260,7 +258,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim public void incrementResourceCount(long accountId, ResourceType type, Long... delta) { // don't upgrade resource count for system account if (accountId == Account.ACCOUNT_ID_SYSTEM) { - s_logger.trace("Not incrementing resource count for system accounts, returning"); + logger.trace("Not incrementing resource count for system accounts, returning"); return; } @@ -276,7 +274,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim public void decrementResourceCount(long accountId, ResourceType type, Long... delta) { // don't upgrade resource count for system account if (accountId == Account.ACCOUNT_ID_SYSTEM) { - s_logger.trace("Not decrementing resource count for system accounts, returning"); + logger.trace("Not decrementing resource count for system accounts, returning"); return; } long numToDecrement = (delta.length == 0) ? 1 : delta[0].longValue(); @@ -450,7 +448,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim " has been exceeded."; } ResourceAllocationException e= new ResourceAllocationException(message, type);; - s_logger.error(message, e); + logger.error(message, e); throw e; } @@ -795,7 +793,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim for (ResourceCountVO rowToUpdate : rowsToUpdate) { if (!_resourceCountDao.updateById(rowToUpdate.getId(), increment, delta)) { - s_logger.trace("Unable to update resource count for the row " + rowToUpdate); + logger.trace("Unable to update resource count for the row " + rowToUpdate); result = false; } } @@ -804,7 +802,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim } }); } catch (Exception ex) { - s_logger.error("Failed to update resource count for account id=" + accountId); + logger.error("Failed to update resource count for account id=" + accountId); return false; } } @@ -850,7 +848,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim _resourceCountDao.setResourceCount(domainId, ResourceOwnerType.Domain, type, newCount); if (oldCount != newCount) { - s_logger.info("Discrepency in the resource count " + "(original count=" + oldCount + " correct count = " + newCount + ") for type " + type + + logger.info("Discrepency in the resource count " + "(original count=" + oldCount + " correct count = " + newCount + ") for type " + type + " for domain ID " + domainId + " is fixed during resource count recalculation."); } @@ -912,7 +910,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim // No need to log message for primary and secondary storage because both are recalculating the resource count which will not lead to any discrepancy. if (!Long.valueOf(oldCount).equals(newCount) && (type != Resource.ResourceType.primary_storage && type != Resource.ResourceType.secondary_storage)) { - s_logger.info("Discrepency in the resource count " + "(original count=" + oldCount + " correct count = " + newCount + ") for type " + type + + logger.info("Discrepency in the resource count " + "(original count=" + oldCount + " correct count = " + newCount + ") for type " + type + " for account ID " + accountId + " is fixed during resource count recalculation."); } @@ -1070,7 +1068,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim @Override protected void runInContext() { - s_logger.info("Running resource count check periodic task"); + logger.info("Running resource count check periodic task"); List<DomainVO> domains = _domainDao.findImmediateChildrenForParent(Domain.ROOT_DOMAIN); // recalculateDomainResourceCount will take care of re-calculation of resource counts for sub-domains http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3818257a/server/src/com/cloud/server/ConfigurationServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index 5ff548c..6cf5516 100644 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -46,7 +46,6 @@ import javax.naming.ConfigurationException; import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.apache.cloudstack.config.ApiServiceConfiguration; import org.apache.cloudstack.framework.config.ConfigDepot; @@ -121,7 +120,6 @@ import com.cloud.utils.nio.Link; import com.cloud.utils.script.Script; public class ConfigurationServerImpl extends ManagerBase implements ConfigurationServer { - public static final Logger s_logger = Logger.getLogger(ConfigurationServerImpl.class); @Inject private ConfigurationDao _configDao; @@ -182,7 +180,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio String init = _configDao.getValue("init"); if (init == null || init.equals("false")) { - s_logger.debug("ConfigurationServer is saving default values to the database."); + logger.debug("ConfigurationServer is saving default values to the database."); // Save default Configuration Table values List<String> categories = Config.getCategories(); @@ -212,19 +210,19 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } _configDao.update(Config.UseSecondaryStorageVm.key(), Config.UseSecondaryStorageVm.getCategory(), "true"); - s_logger.debug("ConfigurationServer made secondary storage vm required."); + logger.debug("ConfigurationServer made secondary storage vm required."); _configDao.update(Config.SecStorageEncryptCopy.key(), Config.SecStorageEncryptCopy.getCategory(), "false"); - s_logger.debug("ConfigurationServer made secondary storage copy encrypt set to false."); + logger.debug("ConfigurationServer made secondary storage copy encrypt set to false."); _configDao.update("secstorage.secure.copy.cert", "realhostip"); - s_logger.debug("ConfigurationServer made secondary storage copy use realhostip."); + logger.debug("ConfigurationServer made secondary storage copy use realhostip."); _configDao.update("user.password.encoders.exclude", "MD5,LDAP,PLAINTEXT"); - s_logger.debug("Configuration server excluded insecure encoders"); + logger.debug("Configuration server excluded insecure encoders"); _configDao.update("user.authenticators.exclude", "PLAINTEXT"); - s_logger.debug("Configuration server excluded plaintext authenticator"); + logger.debug("Configuration server excluded plaintext authenticator"); // Save default service offerings createServiceOffering(User.UID_SYSTEM, "Small Instance", 1, 512, 500, "Small Instance", ProvisioningType.THIN, false, false, null); @@ -240,9 +238,9 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio String mountParent = getMountParent(); if (mountParent != null) { _configDao.update(Config.MountParent.key(), Config.MountParent.getCategory(), mountParent); - s_logger.debug("ConfigurationServer saved \"" + mountParent + "\" as mount.parent."); + logger.debug("ConfigurationServer saved \"" + mountParent + "\" as mount.parent."); } else { - s_logger.debug("ConfigurationServer could not detect mount.parent."); + logger.debug("ConfigurationServer could not detect mount.parent."); } String hostIpAdr = NetUtils.getDefaultHostIp(); @@ -258,7 +256,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio if (needUpdateHostIp) { _configDepot.createOrUpdateConfigObject(ApiServiceConfiguration.class.getSimpleName(), ApiServiceConfiguration.ManagementHostIPAdr, hostIpAdr); - s_logger.debug("ConfigurationServer saved \"" + hostIpAdr + "\" as host."); + logger.debug("ConfigurationServer saved \"" + hostIpAdr + "\" as host."); } } @@ -362,7 +360,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } txn.commit(); } catch (Exception e) { - s_logger.warn("Unable to init template " + id + " datails: " + name, e); + logger.warn("Unable to init template " + id + " datails: " + name, e); throw new CloudRuntimeException("Unable to init template " + id + " datails: " + name); } } @@ -409,7 +407,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } } } catch (Exception e) { - s_logger.debug("initiateXenServerPVDriverVersion failed due to " + e.toString()); + logger.debug("initiateXenServerPVDriverVersion failed due to " + e.toString()); // ignore } } @@ -455,7 +453,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio try(final FileInputStream finputstream = new FileInputStream(propsFile);) { props.load(finputstream); }catch (IOException e) { - s_logger.error("getEnvironmentProperty:Exception:" + e.getMessage()); + logger.error("getEnvironmentProperty:Exception:" + e.getMessage()); } return props.getProperty("mount.parent"); } @@ -477,7 +475,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); stmt.executeUpdate(); } catch (SQLException ex) { - s_logger.debug("Looks like system account already exists"); + logger.debug("Looks like system account already exists"); } // insert system user insertSql = "INSERT INTO `cloud`.`user` (id, uuid, username, password, account_id, firstname, lastname, created, user.default)" @@ -487,7 +485,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); stmt.executeUpdate(); } catch (SQLException ex) { - s_logger.debug("Looks like system user already exists"); + logger.debug("Looks like system user already exists"); } // insert admin user, but leave the account disabled until we set a @@ -504,7 +502,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); stmt.executeUpdate(); } catch (SQLException ex) { - s_logger.debug("Looks like admin account already exists"); + logger.debug("Looks like admin account already exists"); } // now insert the user @@ -515,7 +513,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); stmt.executeUpdate(); } catch (SQLException ex) { - s_logger.debug("Looks like admin user already exists"); + logger.debug("Looks like admin user already exists"); } try { @@ -546,12 +544,12 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio stmt = txn.prepareAutoCloseStatement(insertSql); stmt.executeUpdate(); } catch (SQLException ex) { - s_logger.warn("Failed to create default security group for default admin account due to ", ex); + logger.warn("Failed to create default security group for default admin account due to ", ex); } } rs.close(); } catch (Exception ex) { - s_logger.warn("Failed to create default security group for default admin account due to ", ex); + logger.warn("Failed to create default security group for default admin account due to ", ex); } } }); @@ -593,7 +591,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio ou = group[i] + "." + ou; } } catch (UnknownHostException ex) { - s_logger.info("Fail to get user's domain name. Would use cloud.com. ", ex); + logger.info("Fail to get user's domain name. Would use cloud.com. ", ex); ou = "cloud.com"; } @@ -615,8 +613,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } protected void updateSSLKeystore() { - if (s_logger.isInfoEnabled()) { - s_logger.info("Processing updateSSLKeyStore"); + if (logger.isInfoEnabled()) { + logger.info("Processing updateSSLKeyStore"); } String dbString = _configDao.getValue("ssl.keystore"); @@ -634,19 +632,19 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio boolean dbExisted = (dbString != null && !dbString.isEmpty()); - s_logger.info("SSL keystore located at " + keystorePath); + logger.info("SSL keystore located at " + keystorePath); try { if (!dbExisted && null != confFile) { if (!keystoreFile.exists()) { generateDefaultKeystore(keystorePath); - s_logger.info("Generated SSL keystore."); + logger.info("Generated SSL keystore."); } String base64Keystore = getBase64Keystore(keystorePath); ConfigurationVO configVO = new ConfigurationVO("Hidden", "DEFAULT", "management-server", "ssl.keystore", base64Keystore, "SSL Keystore for the management servers"); _configDao.persist(configVO); - s_logger.info("Stored SSL keystore to database."); + logger.info("Stored SSL keystore to database."); } else { // !keystoreFile.exists() and dbExisted // Export keystore to local file byte[] storeBytes = Base64.decodeBase64(dbString); @@ -670,10 +668,10 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } catch (Exception e) { throw new IOException("Fail to create keystore file!", e); } - s_logger.info("Stored database keystore to local."); + logger.info("Stored database keystore to local."); } } catch (Exception ex) { - s_logger.warn("Would use fail-safe keystore to continue.", ex); + logger.warn("Would use fail-safe keystore to continue.", ex); } } @@ -698,9 +696,9 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio PreparedStatement stmt = txn.prepareAutoCloseStatement(wSql); stmt.setString(1, DBEncryptionUtil.encrypt(rpassword)); stmt.executeUpdate(); - s_logger.info("Updated systemvm password in database"); + logger.info("Updated systemvm password in database"); } catch (SQLException e) { - s_logger.error("Cannot retrieve systemvm password", e); + logger.error("Cannot retrieve systemvm password", e); } } @@ -714,7 +712,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio String username = System.getProperty("user.name"); Boolean devel = Boolean.valueOf(_configDao.getValue("developer")); if (!username.equalsIgnoreCase("cloud") && !devel) { - s_logger.warn("Systemvm keypairs could not be set. Management server should be run as cloud user, or in development mode."); + logger.warn("Systemvm keypairs could not be set. Management server should be run as cloud user, or in development mode."); return; } String already = _configDao.getValue("ssh.privatekey"); @@ -723,12 +721,12 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio throw new CloudRuntimeException("Cannot get home directory for account: " + username); } - if (s_logger.isInfoEnabled()) { - s_logger.info("Processing updateKeyPairs"); + if (logger.isInfoEnabled()) { + logger.info("Processing updateKeyPairs"); } if (homeDir != null && homeDir.startsWith("~")) { - s_logger.error("No home directory was detected for the user '" + username + "'. Please check the profile of this user."); + logger.error("No home directory was detected for the user '" + username + "'. Please check the profile of this user."); throw new CloudRuntimeException("No home directory was detected for the user '" + username + "'. Please check the profile of this user."); } @@ -744,8 +742,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } if (already == null || already.isEmpty()) { - if (s_logger.isInfoEnabled()) { - s_logger.info("Systemvm keypairs not found in database. Need to store them in the database"); + if (logger.isInfoEnabled()) { + logger.info("Systemvm keypairs not found in database. Need to store them in the database"); } // FIXME: take a global database lock here for safety. boolean onWindows = isOnWindows(); @@ -757,9 +755,9 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio try (DataInputStream dis = new DataInputStream(new FileInputStream(privkeyfile))) { dis.readFully(arr1); } catch (EOFException e) { - s_logger.info("[ignored] eof reached"); + logger.info("[ignored] eof reached"); } catch (Exception e) { - s_logger.error("Cannot read the private key file", e); + logger.error("Cannot read the private key file", e); throw new CloudRuntimeException("Cannot read the private key file"); } String privateKey = new String(arr1).trim(); @@ -767,9 +765,9 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio try (DataInputStream dis = new DataInputStream(new FileInputStream(pubkeyfile))) { dis.readFully(arr2); } catch (EOFException e) { - s_logger.info("[ignored] eof reached"); + logger.info("[ignored] eof reached"); } catch (Exception e) { - s_logger.warn("Cannot read the public key file", e); + logger.warn("Cannot read the public key file", e); throw new CloudRuntimeException("Cannot read the public key file"); } String publicKey = new String(arr2).trim(); @@ -791,32 +789,32 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio try { PreparedStatement stmt1 = txn.prepareAutoCloseStatement(insertSql1); stmt1.executeUpdate(); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Private key inserted into database"); + if (logger.isDebugEnabled()) { + logger.debug("Private key inserted into database"); } } catch (SQLException ex) { - s_logger.error("SQL of the private key failed", ex); + logger.error("SQL of the private key failed", ex); throw new CloudRuntimeException("SQL of the private key failed"); } try { PreparedStatement stmt2 = txn.prepareAutoCloseStatement(insertSql2); stmt2.executeUpdate(); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Public key inserted into database"); + if (logger.isDebugEnabled()) { + logger.debug("Public key inserted into database"); } } catch (SQLException ex) { - s_logger.error("SQL of the public key failed", ex); + logger.error("SQL of the public key failed", ex); throw new CloudRuntimeException("SQL of the public key failed"); } } }); } else { - s_logger.info("Keypairs already in database, updating local copy"); + logger.info("Keypairs already in database, updating local copy"); updateKeyPairsOnDisk(homeDir); } - s_logger.info("Going to update systemvm iso with generated keypairs if needed"); + logger.info("Going to update systemvm iso with generated keypairs if needed"); try { injectSshKeysIntoSystemVmIsoPatch(pubkeyfile.getAbsolutePath(), privkeyfile.getAbsolutePath()); } catch (CloudRuntimeException e) { @@ -846,7 +844,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio try { keyfile.createNewFile(); } catch (IOException e) { - s_logger.warn("Failed to create file: " + e.toString()); + logger.warn("Failed to create file: " + e.toString()); throw new CloudRuntimeException("Failed to update keypairs on disk: cannot create key file " + keyPath); } } @@ -857,10 +855,10 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio kStream.write(key.getBytes()); } } catch (FileNotFoundException e) { - s_logger.warn("Failed to write key to " + keyfile.getAbsolutePath()); + logger.warn("Failed to write key to " + keyfile.getAbsolutePath()); throw new CloudRuntimeException("Failed to update keypairs on disk: cannot find key file " + keyPath); } catch (IOException e) { - s_logger.warn("Failed to write key to " + keyfile.getAbsolutePath()); + logger.warn("Failed to write key to " + keyfile.getAbsolutePath()); throw new CloudRuntimeException("Failed to update keypairs on disk: cannot write to key file " + keyPath); } } @@ -871,7 +869,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio File keyDir = new File(homeDir + "/.ssh"); Boolean devel = Boolean.valueOf(_configDao.getValue("developer")); if (!keyDir.isDirectory()) { - s_logger.warn("Failed to create " + homeDir + "/.ssh for storing the SSH keypars"); + logger.warn("Failed to create " + homeDir + "/.ssh for storing the SSH keypars"); keyDir.mkdir(); } String pubKey = _configDao.getValue("ssh.publickey"); @@ -888,7 +886,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } protected void injectSshKeysIntoSystemVmIsoPatch(String publicKeyPath, String privKeyPath) { - s_logger.info("Trying to inject public and private keys into systemvm iso"); + logger.info("Trying to inject public and private keys into systemvm iso"); String injectScript = getInjectScript(); String scriptPath = Script.findScript("", injectScript); String systemVmIsoPath = Script.findScript("", "vms/systemvm.iso"); @@ -900,9 +898,9 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } Script command = null; if(isOnWindows()) { - command = new Script("python", s_logger); + command = new Script("python", logger); } else { - command = new Script("/bin/bash", s_logger); + command = new Script("/bin/bash", logger); } if (isOnWindows()) { scriptPath = scriptPath.replaceAll("\\\\" ,"/" ); @@ -916,9 +914,9 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio command.add(systemVmIsoPath); final String result = command.execute(); - s_logger.info("Injected public and private keys into systemvm iso with result : " + result); + logger.info("Injected public and private keys into systemvm iso with result : " + result); if (result != null) { - s_logger.warn("Failed to inject generated public key into systemvm iso " + result); + logger.warn("Failed to inject generated public key into systemvm iso " + result); throw new CloudRuntimeException("Failed to inject generated public key into systemvm iso " + result); } } @@ -946,7 +944,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio if (already == null) { - s_logger.info("Need to store secondary storage vm copy password in the database"); + logger.info("Need to store secondary storage vm copy password in the database"); String password = PasswordGenerator.generateRandomPassword(12); final String insertSql1 = @@ -961,9 +959,9 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio try { PreparedStatement stmt1 = txn.prepareAutoCloseStatement(insertSql1); stmt1.executeUpdate(); - s_logger.debug("secondary storage vm copy password inserted into database"); + logger.debug("secondary storage vm copy password inserted into database"); } catch (SQLException ex) { - s_logger.warn("Failed to insert secondary storage vm copy password", ex); + logger.warn("Failed to insert secondary storage vm copy password", ex); } } }); @@ -974,7 +972,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio try { _configDao.update(Config.SSOKey.key(), Config.SSOKey.getCategory(), getPrivateKey()); } catch (NoSuchAlgorithmException ex) { - s_logger.error("error generating sso key", ex); + logger.error("error generating sso key", ex); } } @@ -987,14 +985,14 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio if(configInDB == null) { ConfigurationVO configVO = new ConfigurationVO(Config.SSVMPSK.getCategory(), "DEFAULT", Config.SSVMPSK.getComponent(), Config.SSVMPSK.key(), getPrivateKey(), Config.SSVMPSK.getDescription()); - s_logger.info("generating a new SSVM PSK. This goes to SSVM on Start"); + logger.info("generating a new SSVM PSK. This goes to SSVM on Start"); _configDao.persist(configVO); } else if (StringUtils.isEmpty(configInDB.getValue())) { - s_logger.info("updating the SSVM PSK with new value. This goes to SSVM on Start"); + logger.info("updating the SSVM PSK with new value. This goes to SSVM on Start"); _configDao.update(Config.SSVMPSK.key(), Config.SSVMPSK.getCategory(), getPrivateKey()); } } catch (NoSuchAlgorithmException ex) { - s_logger.error("error generating ssvm psk", ex); + logger.error("error generating ssvm psk", ex); } } @@ -1062,7 +1060,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } }); } catch (Exception e) { - s_logger.error("Unable to create new pod due to " + e.getMessage(), e); + logger.error("Unable to create new pod due to " + e.getMessage(), e); throw new InternalErrorException("Failed to create new pod. Please contact Cloud Support."); } @@ -1171,7 +1169,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(defaultSharedSGNetworkOffering.getId(), service, defaultSharedSGNetworkOfferingProviders.get(service)); _ntwkOfferingServiceMapDao.persist(offService); - s_logger.trace("Added service for the network offering: " + offService); + logger.trace("Added service for the network offering: " + offService); } // Offering #2 @@ -1186,7 +1184,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(defaultSharedNetworkOffering.getId(), service, defaultSharedNetworkOfferingProviders.get(service)); _ntwkOfferingServiceMapDao.persist(offService); - s_logger.trace("Added service for the network offering: " + offService); + logger.trace("Added service for the network offering: " + offService); } // Offering #3 @@ -1203,7 +1201,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio new NetworkOfferingServiceMapVO(defaultIsolatedSourceNatEnabledNetworkOffering.getId(), service, defaultIsolatedSourceNatEnabledNetworkOfferingProviders.get(service)); _ntwkOfferingServiceMapDao.persist(offService); - s_logger.trace("Added service for the network offering: " + offService); + logger.trace("Added service for the network offering: " + offService); } // Offering #4 @@ -1218,7 +1216,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(defaultIsolatedEnabledNetworkOffering.getId(), service, defaultIsolatedNetworkOfferingProviders.get(service)); _ntwkOfferingServiceMapDao.persist(offService); - s_logger.trace("Added service for the network offering: " + offService); + logger.trace("Added service for the network offering: " + offService); } // Offering #5 @@ -1234,7 +1232,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(defaultNetscalerNetworkOffering.getId(), service, netscalerServiceProviders.get(service)); _ntwkOfferingServiceMapDao.persist(offService); - s_logger.trace("Added service for the network offering: " + offService); + logger.trace("Added service for the network offering: " + offService); } // Offering #6 @@ -1262,7 +1260,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(defaultNetworkOfferingForVpcNetworks.getId(), entry.getKey(), entry.getValue()); _ntwkOfferingServiceMapDao.persist(offService); - s_logger.trace("Added service for the network offering: " + offService); + logger.trace("Added service for the network offering: " + offService); } // Offering #7 @@ -1289,7 +1287,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(defaultNetworkOfferingForVpcNetworksNoLB.getId(), entry.getKey(), entry.getValue()); _ntwkOfferingServiceMapDao.persist(offService); - s_logger.trace("Added service for the network offering: " + offService); + logger.trace("Added service for the network offering: " + offService); } //offering #8 - network offering with internal lb service @@ -1313,7 +1311,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio for (Service service : internalLbOffProviders.keySet()) { NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(internalLbOff.getId(), service, internalLbOffProviders.get(service)); _ntwkOfferingServiceMapDao.persist(offService); - s_logger.trace("Added service for the network offering: " + offService); + logger.trace("Added service for the network offering: " + offService); } } }); @@ -1446,7 +1444,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio final int domainExpectedCount = domainSupportedResourceTypes.size(); if ((domainResourceCount.size() < domainExpectedCount * domains.size())) { - s_logger.debug("resource_count table has records missing for some domains...going to insert them"); + logger.debug("resource_count table has records missing for some domains...going to insert them"); for (final DomainVO domain : domains) { // Lock domain Transaction.execute(new TransactionCallbackNoReturn() { @@ -1463,7 +1461,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio for (ResourceType resourceType : domainSupportedResourceTypes) { if (!domainCountStr.contains(resourceType.toString())) { ResourceCountVO resourceCountVO = new ResourceCountVO(resourceType, 0, domain.getId(), ResourceOwnerType.Domain); - s_logger.debug("Inserting resource count of type " + resourceType + " for domain id=" + domain.getId()); + logger.debug("Inserting resource count of type " + resourceType + " for domain id=" + domain.getId()); _resourceCountDao.persist(resourceCountVO); } } @@ -1475,7 +1473,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } if ((accountResourceCount.size() < accountExpectedCount * accounts.size())) { - s_logger.debug("resource_count table has records missing for some accounts...going to insert them"); + logger.debug("resource_count table has records missing for some accounts...going to insert them"); for (final AccountVO account : accounts) { // lock account Transaction.execute(new TransactionCallbackNoReturn() { @@ -1492,7 +1490,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio for (ResourceType resourceType : accountSupportedResourceTypes) { if (!accountCountStr.contains(resourceType.toString())) { ResourceCountVO resourceCountVO = new ResourceCountVO(resourceType, 0, account.getId(), ResourceOwnerType.Account); - s_logger.debug("Inserting resource count of type " + resourceType + " for account id=" + account.getId()); + logger.debug("Inserting resource count of type " + resourceType + " for account id=" + account.getId()); _resourceCountDao.persist(resourceCountVO); } }
