http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java b/engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java index 1cd746d..56a1d3e 100644 --- a/engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java +++ b/engine/schema/src/com/cloud/user/dao/VmDiskStatisticsDaoImpl.java @@ -25,6 +25,7 @@ import java.util.TimeZone; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.user.VmDiskStatisticsVO; @@ -37,6 +38,7 @@ import com.cloud.utils.db.TransactionLegacy; @Component @Local(value = {VmDiskStatisticsDao.class}) public class VmDiskStatisticsDaoImpl extends GenericDaoBase<VmDiskStatisticsVO, Long> implements VmDiskStatisticsDao { + private static final Logger s_logger = Logger.getLogger(VmDiskStatisticsDaoImpl.class); private static final String ACTIVE_AND_RECENTLY_DELETED_SEARCH = "SELECT bcf.id, bcf.data_center_id, bcf.account_id, bcf.vm_id, bcf.volume_id, bcf.agg_io_read, bcf.agg_io_write, bcf.agg_bytes_read, bcf.agg_bytes_write " + "FROM vm_disk_statistics bcf, account a " + "WHERE bcf.account_id = a.id AND (a.removed IS NULL OR a.removed >= ?) " + "ORDER BY bcf.id"; @@ -104,7 +106,7 @@ public class VmDiskStatisticsDaoImpl extends GenericDaoBase<VmDiskStatisticsVO, vmDiskStats.add(toEntityBean(rs, false)); } } catch (Exception ex) { - logger.error("error saving vm disk stats to cloud_usage db", ex); + s_logger.error("error saving vm disk stats to cloud_usage db", ex); } return vmDiskStats; } @@ -122,7 +124,7 @@ public class VmDiskStatisticsDaoImpl extends GenericDaoBase<VmDiskStatisticsVO, vmDiskStats.add(toEntityBean(rs, false)); } } catch (Exception ex) { - logger.error("error lisitng updated vm disk stats", ex); + s_logger.error("error lisitng updated vm disk stats", ex); } return vmDiskStats; }
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java index 40bb971..210300f 100644 --- a/engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java @@ -25,6 +25,7 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.info.ConsoleProxyLoadInfo; @@ -41,6 +42,7 @@ import com.cloud.vm.VirtualMachine.State; @Component @Local(value = {ConsoleProxyDao.class}) public class ConsoleProxyDaoImpl extends GenericDaoBase<ConsoleProxyVO, Long> implements ConsoleProxyDao { + private static final Logger s_logger = Logger.getLogger(ConsoleProxyDaoImpl.class); // // query SQL for returnning console proxy assignment info as following @@ -215,7 +217,7 @@ public class ConsoleProxyDaoImpl extends GenericDaoBase<ConsoleProxyVO, Long> im l.add(new Pair<Long, Integer>(rs.getLong(1), rs.getInt(2))); } } catch (SQLException e) { - logger.debug("Caught SQLException: ", e); + s_logger.debug("Caught SQLException: ", e); } return l; } @@ -240,7 +242,7 @@ public class ConsoleProxyDaoImpl extends GenericDaoBase<ConsoleProxyVO, Long> im l.add(new Pair<Long, Integer>(rs.getLong(1), rs.getInt(2))); } } catch (SQLException e) { - logger.debug("Caught SQLException: ", e); + s_logger.debug("Caught SQLException: ", e); } return l; } @@ -259,7 +261,7 @@ public class ConsoleProxyDaoImpl extends GenericDaoBase<ConsoleProxyVO, Long> im return rs.getInt(1); } } catch (SQLException e) { - logger.debug("Caught SQLException: ", e); + s_logger.debug("Caught SQLException: ", e); } return 0; } @@ -277,7 +279,7 @@ public class ConsoleProxyDaoImpl extends GenericDaoBase<ConsoleProxyVO, Long> im return rs.getInt(1); } } catch (SQLException e) { - logger.debug("Caught SQLException: ", e); + s_logger.debug("Caught SQLException: ", e); } return 0; } @@ -299,7 +301,7 @@ public class ConsoleProxyDaoImpl extends GenericDaoBase<ConsoleProxyVO, Long> im l.add(info); } } catch (SQLException e) { - logger.debug("Exception: ", e); + s_logger.debug("Exception: ", e); } return l; } @@ -321,7 +323,7 @@ public class ConsoleProxyDaoImpl extends GenericDaoBase<ConsoleProxyVO, Long> im l.add(rs.getLong(1)); } } catch (SQLException e) { - logger.debug("Caught SQLException: ", e); + s_logger.debug("Caught SQLException: ", e); } return l; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java index d6da4fb..3007810 100644 --- a/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/UserVmCloneSettingDaoImpl.java @@ -21,6 +21,7 @@ import java.util.List; import javax.annotation.PostConstruct; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.utils.db.DB; @@ -34,6 +35,7 @@ import com.cloud.vm.UserVmCloneSettingVO; @Local(value = {UserVmCloneSettingDao.class}) @DB() public class UserVmCloneSettingDaoImpl extends GenericDaoBase<UserVmCloneSettingVO, Long> implements UserVmCloneSettingDao { + public static final Logger s_logger = Logger.getLogger(UserVmCloneSettingDaoImpl.class); protected SearchBuilder<UserVmCloneSettingVO> vmIdSearch; protected SearchBuilder<UserVmCloneSettingVO> cloneTypeSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java index c9099cd..1f2843d 100644 --- a/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java @@ -30,6 +30,7 @@ import javax.annotation.PostConstruct; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; import com.cloud.server.ResourceTag.ResourceObjectType; import com.cloud.tags.dao.ResourceTagDao; @@ -54,6 +55,7 @@ import com.cloud.vm.dao.UserVmData.SecurityGroupData; @Local(value = {UserVmDao.class}) public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements UserVmDao { + public static final Logger s_logger = Logger.getLogger(UserVmDaoImpl.class); protected SearchBuilder<UserVmVO> AccountPodSearch; protected SearchBuilder<UserVmVO> AccountDataCenterSearch; @@ -376,13 +378,13 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use } } catch (Exception e) { - logger.error("listPodIdsHavingVmsforAccount:Exception: " + e.getMessage()); + s_logger.error("listPodIdsHavingVmsforAccount:Exception: " + e.getMessage()); throw new CloudRuntimeException("listPodIdsHavingVmsforAccount:Exception: " + e.getMessage(), e); } txn.commit(); return result; } catch (Exception e) { - logger.error("listPodIdsHavingVmsforAccount:Exception : " + e.getMessage()); + s_logger.error("listPodIdsHavingVmsforAccount:Exception : " + e.getMessage()); throw new CloudRuntimeException("listPodIdsHavingVmsforAccount:Exception: " + e.getMessage(), e); } finally { @@ -394,7 +396,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use } catch (Exception e) { - logger.error("listVmDetails:Exception:" + e.getMessage()); + s_logger.error("listVmDetails:Exception:" + e.getMessage()); } } @@ -431,7 +433,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use } catch (Exception e) { - logger.error("listVmDetails:Exception:" + e.getMessage()); + s_logger.error("listVmDetails:Exception:" + e.getMessage()); throw new CloudRuntimeException("listVmDetails: Exception:" + e.getMessage(),e); } curr_index += VM_DETAILS_BATCH_SIZE; @@ -439,7 +441,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use } catch (Exception e) { - logger.error("listVmDetails:Exception:" + e.getMessage()); + s_logger.error("listVmDetails:Exception:" + e.getMessage()); throw new CloudRuntimeException("listVmDetails: Exception:" + e.getMessage(),e); } } @@ -467,20 +469,20 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use } catch (Exception e) { - logger.error("listVmDetails: Exception:" + e.getMessage()); + s_logger.error("listVmDetails: Exception:" + e.getMessage()); throw new CloudRuntimeException("listVmDetails: Exception:" + e.getMessage(),e); } } catch (Exception e) { - logger.error("listVmDetails:Exception:" + e.getMessage()); + s_logger.error("listVmDetails:Exception:" + e.getMessage()); throw new CloudRuntimeException("listVmDetails: Exception:" + e.getMessage(),e); } } txn.commit(); return userVmDataHash; } catch (Exception e) { - logger.error("listVmDetails:Exception:" + e.getMessage()); + s_logger.error("listVmDetails:Exception:" + e.getMessage()); throw new CloudRuntimeException("listVmDetails:Exception : ", e); } finally { @@ -492,7 +494,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use } catch (Exception e) { - logger.error("listVmDetails:Exception:" + e.getMessage()); + s_logger.error("listVmDetails:Exception:" + e.getMessage()); } } @@ -654,7 +656,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use } } } catch (SQLException e) { - logger.error("GetVmsDetailsByNames: Exception in sql: " + e.getMessage()); + s_logger.error("GetVmsDetailsByNames: Exception in sql: " + e.getMessage()); throw new CloudRuntimeException("GetVmsDetailsByNames: Exception: " + e.getMessage()); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java index dd5f3ab..be0e366 100644 --- a/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/dao/VMInstanceDaoImpl.java @@ -29,6 +29,7 @@ import javax.annotation.PostConstruct; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.host.HostVO; @@ -65,6 +66,7 @@ import com.cloud.vm.VirtualMachine.Type; @Local(value = {VMInstanceDao.class}) public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implements VMInstanceDao { + public static final Logger s_logger = Logger.getLogger(VMInstanceDaoImpl.class); private static final int MAX_CONSECUTIVE_SAME_STATE_UPDATE_COUNT = 3; protected SearchBuilder<VMInstanceVO> VMClusterSearch; @@ -437,8 +439,8 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem @Override public boolean updateState(State oldState, Event event, State newState, VirtualMachine vm, Object opaque) { if (newState == null) { - if (logger.isDebugEnabled()) { - logger.debug("There's no way to transition from old state: " + oldState.toString() + " event: " + event.toString()); + if (s_logger.isDebugEnabled()) { + s_logger.debug("There's no way to transition from old state: " + oldState.toString() + " event: " + event.toString()); } return false; } @@ -477,7 +479,7 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem if (result == 0) { VMInstanceVO vo = findByIdIncludingRemoved(vm.getId()); - if (logger.isDebugEnabled()) { + if (s_logger.isDebugEnabled()) { if (vo != null) { StringBuilder str = new StringBuilder("Unable to update ").append(vo.toString()); str.append(": DB Data={Host=").append(vo.getHostId()).append("; State=").append(vo.getState().toString()).append("; updated=").append(vo.getUpdated()) @@ -486,16 +488,16 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem .append("; time=").append(vo.getUpdateTime()); str.append("} Stale Data: {Host=").append(oldHostId).append("; State=").append(oldState).append("; updated=").append(oldUpdated).append("; time=") .append(oldUpdateDate).append("}"); - logger.debug(str.toString()); + s_logger.debug(str.toString()); } else { - logger.debug("Unable to update the vm id=" + vm.getId() + "; the vm either doesn't exist or already removed"); + s_logger.debug("Unable to update the vm id=" + vm.getId() + "; the vm either doesn't exist or already removed"); } } if (vo != null && vo.getState() == newState) { // allow for concurrent update if target state has already been matched - logger.debug("VM " + vo.getInstanceName() + " state has been already been updated to " + newState); + s_logger.debug("VM " + vo.getInstanceName() + " state has been already been updated to " + newState); return true; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java b/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java index 2ea46f2..a87d284 100644 --- a/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java +++ b/engine/schema/src/com/cloud/vm/snapshot/dao/VMSnapshotDaoImpl.java @@ -22,6 +22,7 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.utils.db.GenericDaoBase; @@ -37,6 +38,7 @@ import com.cloud.vm.snapshot.VMSnapshotVO; @Component @Local(value = {VMSnapshotDao.class}) public class VMSnapshotDaoImpl extends GenericDaoBase<VMSnapshotVO, Long> implements VMSnapshotDao { + private static final Logger s_logger = Logger.getLogger(VMSnapshotDaoImpl.class); private final SearchBuilder<VMSnapshotVO> SnapshotSearch; private final SearchBuilder<VMSnapshotVO> ExpungingSnapshotSearch; private final SearchBuilder<VMSnapshotVO> SnapshotStatusSearch; @@ -143,7 +145,7 @@ public class VMSnapshotDaoImpl extends GenericDaoBase<VMSnapshotVO, Long> implem builder.set(vo, "updated", new Date()); int rows = update((VMSnapshotVO)vo, sc); - if (rows == 0 && logger.isDebugEnabled()) { + if (rows == 0 && s_logger.isDebugEnabled()) { VMSnapshotVO dbVol = findByIdIncludingRemoved(vo.getId()); if (dbVol != null) { StringBuilder str = new StringBuilder("Unable to update ").append(vo.toString()); @@ -176,7 +178,7 @@ public class VMSnapshotDaoImpl extends GenericDaoBase<VMSnapshotVO, Long> implem .append("; updatedTime=") .append(oldUpdatedTime); } else { - logger.debug("Unable to update VM snapshot: id=" + vo.getId() + ", as there is no such snapshot exists in the database anymore"); + s_logger.debug("Unable to update VM snapshot: id=" + vo.getId() + ", as there is no such snapshot exists in the database anymore"); } } return rows > 0; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java index d681c30..6df243b 100644 --- a/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMEntityDaoImpl.java @@ -23,6 +23,7 @@ import javax.annotation.PostConstruct; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO; @@ -38,6 +39,7 @@ import com.cloud.utils.db.TransactionLegacy; @Local(value = {VMEntityDao.class}) public class VMEntityDaoImpl extends GenericDaoBase<VMEntityVO, Long> implements VMEntityDao { + public static final Logger s_logger = Logger.getLogger(VMEntityDaoImpl.class); @Inject protected VMReservationDao _vmReservationDao; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/org/apache/cloudstack/region/dao/RegionDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/org/apache/cloudstack/region/dao/RegionDaoImpl.java b/engine/schema/src/org/apache/cloudstack/region/dao/RegionDaoImpl.java index f9ff6bf..d7f102d 100644 --- a/engine/schema/src/org/apache/cloudstack/region/dao/RegionDaoImpl.java +++ b/engine/schema/src/org/apache/cloudstack/region/dao/RegionDaoImpl.java @@ -18,6 +18,7 @@ package org.apache.cloudstack.region.dao; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.apache.cloudstack.region.RegionVO; @@ -29,6 +30,7 @@ import com.cloud.utils.db.SearchCriteria; @Component @Local(value = {RegionDao.class}) public class RegionDaoImpl extends GenericDaoBase<RegionVO, Integer> implements RegionDao { + private static final Logger s_logger = Logger.getLogger(RegionDaoImpl.class); protected SearchBuilder<RegionVO> NameSearch; protected SearchBuilder<RegionVO> AllFieldsSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java index 91c886c..b34b697 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java @@ -26,6 +26,7 @@ import java.util.Map; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; @@ -59,6 +60,7 @@ import com.cloud.utils.fsm.NoTransitionException; import com.cloud.utils.fsm.StateMachine2; public class DirectAgentManagerSimpleImpl extends ManagerBase implements AgentManager { + private static final Logger logger = Logger.getLogger(DirectAgentManagerSimpleImpl.class); private final Map<Long, ServerResource> hostResourcesMap = new HashMap<Long, ServerResource>(); @Inject HostDao hostDao; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java ---------------------------------------------------------------------- diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java index c201cf6..13fd54c 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java @@ -24,6 +24,7 @@ import java.util.Map; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; import org.apache.cloudstack.engine.subsystem.api.storage.StrategyPriority; import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotOptions; @@ -70,6 +71,7 @@ import com.cloud.vm.snapshot.VMSnapshotVO; import com.cloud.vm.snapshot.dao.VMSnapshotDao; public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshotStrategy { + private static final Logger s_logger = Logger.getLogger(DefaultVMSnapshotStrategy.class); @Inject VMSnapshotHelper vmSnapshotHelper; @Inject @@ -146,7 +148,7 @@ public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshot answer = (CreateVMSnapshotAnswer)agentMgr.send(hostId, ccmd); if (answer != null && answer.getResult()) { processAnswer(vmSnapshotVO, userVm, answer, hostId); - logger.debug("Create vm snapshot " + vmSnapshot.getName() + " succeeded for vm: " + userVm.getInstanceName()); + s_logger.debug("Create vm snapshot " + vmSnapshot.getName() + " succeeded for vm: " + userVm.getInstanceName()); result = true; for (VolumeObjectTO volumeTo : answer.getVolumeTOs()) { @@ -157,21 +159,21 @@ public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshot String errMsg = "Creating VM snapshot: " + vmSnapshot.getName() + " failed"; if (answer != null && answer.getDetails() != null) errMsg = errMsg + " due to " + answer.getDetails(); - logger.error(errMsg); + s_logger.error(errMsg); throw new CloudRuntimeException(errMsg); } } catch (OperationTimedoutException e) { - logger.debug("Creating VM snapshot: " + vmSnapshot.getName() + " failed: " + e.toString()); + s_logger.debug("Creating VM snapshot: " + vmSnapshot.getName() + " failed: " + e.toString()); throw new CloudRuntimeException("Creating VM snapshot: " + vmSnapshot.getName() + " failed: " + e.toString()); } catch (AgentUnavailableException e) { - logger.debug("Creating VM snapshot: " + vmSnapshot.getName() + " failed", e); + s_logger.debug("Creating VM snapshot: " + vmSnapshot.getName() + " failed", e); throw new CloudRuntimeException("Creating VM snapshot: " + vmSnapshot.getName() + " failed: " + e.toString()); } finally { if (!result) { try { vmSnapshotHelper.vmSnapshotStateTransitTo(vmSnapshot, VMSnapshot.Event.OperationFailed); } catch (NoTransitionException e1) { - logger.error("Cannot set vm snapshot state due to: " + e1.getMessage()); + s_logger.error("Cannot set vm snapshot state due to: " + e1.getMessage()); } } } @@ -184,7 +186,7 @@ public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshot try { vmSnapshotHelper.vmSnapshotStateTransitTo(vmSnapshot, VMSnapshot.Event.ExpungeRequested); } catch (NoTransitionException e) { - logger.debug("Failed to change vm snapshot state with event ExpungeRequested"); + s_logger.debug("Failed to change vm snapshot state with event ExpungeRequested"); throw new CloudRuntimeException("Failed to change vm snapshot state with event ExpungeRequested: " + e.getMessage()); } @@ -212,7 +214,7 @@ public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshot return true; } else { String errMsg = (answer == null) ? null : answer.getDetails(); - logger.error("Delete vm snapshot " + vmSnapshot.getName() + " of vm " + userVm.getInstanceName() + " failed due to " + errMsg); + s_logger.error("Delete vm snapshot " + vmSnapshot.getName() + " of vm " + userVm.getInstanceName() + " failed due to " + errMsg); throw new CloudRuntimeException("Delete vm snapshot " + vmSnapshot.getName() + " of vm " + userVm.getInstanceName() + " failed due to " + errMsg); } } catch (OperationTimedoutException e) { @@ -245,7 +247,7 @@ public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshot }); } catch (Exception e) { String errMsg = "Error while process answer: " + as.getClass() + " due to " + e.getMessage(); - logger.error(errMsg, e); + s_logger.error(errMsg, e); throw new CloudRuntimeException(errMsg); } } @@ -365,21 +367,21 @@ public class DefaultVMSnapshotStrategy extends ManagerBase implements VMSnapshot String errMsg = "Revert VM: " + userVm.getInstanceName() + " to snapshot: " + vmSnapshotVO.getName() + " failed"; if (answer != null && answer.getDetails() != null) errMsg = errMsg + " due to " + answer.getDetails(); - logger.error(errMsg); + s_logger.error(errMsg); throw new CloudRuntimeException(errMsg); } } catch (OperationTimedoutException e) { - logger.debug("Failed to revert vm snapshot", e); + s_logger.debug("Failed to revert vm snapshot", e); throw new CloudRuntimeException(e.getMessage()); } catch (AgentUnavailableException e) { - logger.debug("Failed to revert vm snapshot", e); + s_logger.debug("Failed to revert vm snapshot", e); throw new CloudRuntimeException(e.getMessage()); } finally { if (!result) { try { vmSnapshotHelper.vmSnapshotStateTransitTo(vmSnapshot, VMSnapshot.Event.OperationFailed); } catch (NoTransitionException e1) { - logger.error("Cannot set vm snapshot state due to: " + e1.getMessage()); + s_logger.error("Cannot set vm snapshot state due to: " + e1.getMessage()); } } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java index c446d16..73a8544 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java @@ -28,6 +28,7 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import com.cloud.storage.Storage; +import org.apache.log4j.Logger; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; @@ -53,6 +54,7 @@ import com.cloud.vm.DiskProfile; import com.cloud.vm.VirtualMachineProfile; public abstract class AbstractStoragePoolAllocator extends AdapterBase implements StoragePoolAllocator { + private static final Logger s_logger = Logger.getLogger(AbstractStoragePoolAllocator.class); @Inject StorageManager storageMgr; protected @Inject @@ -114,8 +116,8 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement } List<Long> poolIdsByCapacity = _capacityDao.orderHostsByFreeCapacity(clusterId, capacityType); - if (logger.isDebugEnabled()) { - logger.debug("List of pools in descending order of free capacity: "+ poolIdsByCapacity); + if (s_logger.isDebugEnabled()) { + s_logger.debug("List of pools in descending order of free capacity: "+ poolIdsByCapacity); } //now filter the given list of Pools by this ordered list @@ -144,8 +146,8 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement Long clusterId = plan.getClusterId(); List<Long> poolIdsByVolCount = _volumeDao.listPoolIdsByVolumeCount(dcId, podId, clusterId, account.getAccountId()); - if (logger.isDebugEnabled()) { - logger.debug("List of pools in ascending order of number of volumes for account id: " + account.getAccountId() + " is: " + poolIdsByVolCount); + if (s_logger.isDebugEnabled()) { + s_logger.debug("List of pools in ascending order of number of volumes for account id: " + account.getAccountId() + " is: " + poolIdsByVolCount); } // now filter the given list of Pools by this ordered list @@ -187,12 +189,12 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement protected boolean filter(ExcludeList avoid, StoragePool pool, DiskProfile dskCh, DeploymentPlan plan) { - if (logger.isDebugEnabled()) { - logger.debug("Checking if storage pool is suitable, name: " + pool.getName() + " ,poolId: " + pool.getId()); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Checking if storage pool is suitable, name: " + pool.getName() + " ,poolId: " + pool.getId()); } if (avoid.shouldAvoid(pool)) { - if (logger.isDebugEnabled()) { - logger.debug("StoragePool is in avoid set, skipping this pool"); + if (s_logger.isDebugEnabled()) { + s_logger.debug("StoragePool is in avoid set, skipping this pool"); } return false; } @@ -201,14 +203,14 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement if (clusterId != null) { ClusterVO cluster = _clusterDao.findById(clusterId); if (!(cluster.getHypervisorType() == dskCh.getHypervisorType())) { - if (logger.isDebugEnabled()) { - logger.debug("StoragePool's Cluster does not have required hypervisorType, skipping this pool"); + if (s_logger.isDebugEnabled()) { + s_logger.debug("StoragePool's Cluster does not have required hypervisorType, skipping this pool"); } return false; } } else if (pool.getHypervisor() != null && !pool.getHypervisor().equals(HypervisorType.Any) && !(pool.getHypervisor() == dskCh.getHypervisorType())) { - if (logger.isDebugEnabled()) { - logger.debug("StoragePool does not have required hypervisorType, skipping this pool"); + if (s_logger.isDebugEnabled()) { + s_logger.debug("StoragePool does not have required hypervisorType, skipping this pool"); } return false; } @@ -233,13 +235,13 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement //LXC ROOT disks supports NFS and local storage pools only if(!(Storage.StoragePoolType.NetworkFilesystem.equals(poolType) || Storage.StoragePoolType.Filesystem.equals(poolType)) ){ - logger.debug("StoragePool does not support LXC ROOT disk, skipping this pool"); + s_logger.debug("StoragePool does not support LXC ROOT disk, skipping this pool"); return false; } } else if (Volume.Type.DATADISK.equals(volType)){ //LXC DATA disks supports RBD storage pool only if(!Storage.StoragePoolType.RBD.equals(poolType)){ - logger.debug("StoragePool does not support LXC DATA disk, skipping this pool"); + s_logger.debug("StoragePool does not support LXC DATA disk, skipping this pool"); return false; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java index d529710..761c3a8 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java @@ -23,6 +23,7 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; @@ -37,6 +38,7 @@ import com.cloud.vm.VirtualMachineProfile; @Local(value = StoragePoolAllocator.class) public class GarbageCollectingStoragePoolAllocator extends AbstractStoragePoolAllocator { + private static final Logger s_logger = Logger.getLogger(GarbageCollectingStoragePoolAllocator.class); StoragePoolAllocator _firstFitStoragePoolAllocator; StoragePoolAllocator _localStoragePoolAllocator; @@ -48,9 +50,9 @@ public class GarbageCollectingStoragePoolAllocator extends AbstractStoragePoolAl @Override public List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid, int returnUpTo) { - logger.debug("GarbageCollectingStoragePoolAllocator looking for storage pool"); + s_logger.debug("GarbageCollectingStoragePoolAllocator looking for storage pool"); if (!_storagePoolCleanupEnabled) { - logger.debug("Storage pool cleanup is not enabled, so GarbageCollectingStoragePoolAllocator is being skipped."); + s_logger.debug("Storage pool cleanup is not enabled, so GarbageCollectingStoragePoolAllocator is being skipped."); return null; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java index 51c7cb6..a4edf76 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java @@ -28,6 +28,7 @@ import javax.naming.ConfigurationException; import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.capacity.dao.CapacityDao; @@ -46,6 +47,7 @@ import com.cloud.vm.dao.VMInstanceDao; @Component @Local(value = StoragePoolAllocator.class) public class LocalStoragePoolAllocator extends AbstractStoragePoolAllocator { + private static final Logger s_logger = Logger.getLogger(LocalStoragePoolAllocator.class); @Inject StoragePoolHostDao _poolHostDao; @@ -62,18 +64,18 @@ public class LocalStoragePoolAllocator extends AbstractStoragePoolAllocator { @Override protected List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid, int returnUpTo) { - logger.debug("LocalStoragePoolAllocator trying to find storage pool to fit the vm"); + s_logger.debug("LocalStoragePoolAllocator trying to find storage pool to fit the vm"); if (!dskCh.useLocalStorage()) { return null; } - if (logger.isTraceEnabled()) { + if (s_logger.isTraceEnabled()) { // Log the pools details that are ignored because they are in disabled state List<StoragePoolVO> disabledPools = _storagePoolDao.findDisabledPoolsByScope(plan.getDataCenterId(), plan.getPodId(), plan.getClusterId(), ScopeType.HOST); if (disabledPools != null && !disabledPools.isEmpty()) { for (StoragePoolVO pool : disabledPools) { - logger.trace("Ignoring pool " + pool + " as it is in disabled state."); + s_logger.trace("Ignoring pool " + pool + " as it is in disabled state."); } } } @@ -87,7 +89,7 @@ public class LocalStoragePoolAllocator extends AbstractStoragePoolAllocator { if (pool != null && pool.isLocal()) { StoragePool storagePool = (StoragePool)this.dataStoreMgr.getPrimaryDataStore(pool.getId()); if (filter(avoid, storagePool, dskCh, plan)) { - logger.debug("Found suitable local storage pool " + pool.getId() + ", adding to list"); + s_logger.debug("Found suitable local storage pool " + pool.getId() + ", adding to list"); suitablePools.add(storagePool); } else { avoid.addPool(pool.getId()); @@ -126,8 +128,8 @@ public class LocalStoragePoolAllocator extends AbstractStoragePoolAllocator { } } - if (logger.isDebugEnabled()) { - logger.debug("LocalStoragePoolAllocator returning " + suitablePools.size() + " suitable storage pools"); + if (s_logger.isDebugEnabled()) { + s_logger.debug("LocalStoragePoolAllocator returning " + suitablePools.size() + " suitable storage pools"); } return suitablePools; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java index 229bc68..7a10966 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java @@ -23,6 +23,7 @@ import java.util.Map; import javax.inject.Inject; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; @@ -40,6 +41,7 @@ import com.cloud.vm.VirtualMachineProfile; @Component public class ZoneWideStoragePoolAllocator extends AbstractStoragePoolAllocator { + private static final Logger s_logger = Logger.getLogger(ZoneWideStoragePoolAllocator.class); @Inject PrimaryDataStoreDao _storagePoolDao; @Inject @@ -48,18 +50,18 @@ public class ZoneWideStoragePoolAllocator extends AbstractStoragePoolAllocator { @Override protected List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid, int returnUpTo) { - logger.debug("ZoneWideStoragePoolAllocator to find storage pool"); + s_logger.debug("ZoneWideStoragePoolAllocator to find storage pool"); if (dskCh.useLocalStorage()) { return null; } - if (logger.isTraceEnabled()) { + if (s_logger.isTraceEnabled()) { // Log the pools details that are ignored because they are in disabled state List<StoragePoolVO> disabledPools = _storagePoolDao.findDisabledPoolsByScope(plan.getDataCenterId(), null, null, ScopeType.ZONE); if (disabledPools != null && !disabledPools.isEmpty()) { for (StoragePoolVO pool : disabledPools) { - logger.trace("Ignoring pool " + pool + " as it is in disabled state."); + s_logger.trace("Ignoring pool " + pool + " as it is in disabled state."); } } } @@ -112,8 +114,8 @@ public class ZoneWideStoragePoolAllocator extends AbstractStoragePoolAllocator { long dcId = plan.getDataCenterId(); List<Long> poolIdsByVolCount = _volumeDao.listZoneWidePoolIdsByVolumeCount(dcId, account.getAccountId()); - if (logger.isDebugEnabled()) { - logger.debug("List of pools in ascending order of number of volumes for account id: " + account.getAccountId() + " is: " + poolIdsByVolCount); + if (s_logger.isDebugEnabled()) { + s_logger.debug("List of pools in ascending order of number of volumes for account id: " + account.getAccountId() + " is: " + poolIdsByVolCount); } // now filter the given list of Pools by this ordered list http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java index 47ebd27..6e36514 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java @@ -30,6 +30,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.apache.cloudstack.api.response.StorageProviderResponse; @@ -47,6 +48,7 @@ import com.cloud.utils.component.Registry; @Component public class DataStoreProviderManagerImpl extends ManagerBase implements DataStoreProviderManager, Registry<DataStoreProvider> { + private static final Logger s_logger = Logger.getLogger(DataStoreProviderManagerImpl.class); List<DataStoreProvider> providers; protected Map<String, DataStoreProvider> providerMap = new ConcurrentHashMap<String, DataStoreProvider>(); @@ -121,18 +123,18 @@ public class DataStoreProviderManagerImpl extends ManagerBase implements DataSto String providerName = provider.getName(); if (providerMap.get(providerName) != null) { - logger.debug("Did not register data store provider, provider name: " + providerName + " is not unique"); + s_logger.debug("Did not register data store provider, provider name: " + providerName + " is not unique"); return false; } - logger.debug("registering data store provider:" + provider.getName()); + s_logger.debug("registering data store provider:" + provider.getName()); providerMap.put(providerName, provider); try { boolean registrationResult = provider.configure(copyParams); if (!registrationResult) { providerMap.remove(providerName); - logger.debug("Failed to register data store provider: " + providerName); + s_logger.debug("Failed to register data store provider: " + providerName); return false; } @@ -144,7 +146,7 @@ public class DataStoreProviderManagerImpl extends ManagerBase implements DataSto imageStoreProviderMgr.registerDriver(provider.getName(), (ImageStoreDriver)provider.getDataStoreDriver()); } } catch (Exception e) { - logger.debug("configure provider failed", e); + s_logger.debug("configure provider failed", e); providerMap.remove(providerName); return false; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java index 4b13c10..a492e76 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/db/ObjectInDataStoreDaoImpl.java @@ -21,6 +21,7 @@ import java.util.Map; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; @@ -35,6 +36,7 @@ import com.cloud.utils.db.UpdateBuilder; @Component public class ObjectInDataStoreDaoImpl extends GenericDaoBase<ObjectInDataStoreVO, Long> implements ObjectInDataStoreDao { + private static final Logger s_logger = Logger.getLogger(ObjectInDataStoreDaoImpl.class); private SearchBuilder<ObjectInDataStoreVO> updateStateSearch; @Override @@ -67,7 +69,7 @@ public class ObjectInDataStoreDaoImpl extends GenericDaoBase<ObjectInDataStoreVO builder.set(vo, "updated", new Date()); int rows = update(vo, sc); - if (rows == 0 && logger.isDebugEnabled()) { + if (rows == 0 && s_logger.isDebugEnabled()) { ObjectInDataStoreVO dbVol = findByIdIncludingRemoved(vo.getId()); if (dbVol != null) { StringBuilder str = new StringBuilder("Unable to update ").append(vo.toString()); @@ -100,7 +102,7 @@ public class ObjectInDataStoreDaoImpl extends GenericDaoBase<ObjectInDataStoreVO .append("; updatedTime=") .append(oldUpdatedTime); } else { - logger.debug("Unable to update objectIndatastore: id=" + vo.getId() + ", as there is no such object exists in the database anymore"); + s_logger.debug("Unable to update objectIndatastore: id=" + vo.getId() + ", as there is no such object exists in the database anymore"); } } return rows > 0; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java index 2505266..142cd66 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java @@ -25,6 +25,7 @@ import java.util.Map; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; @@ -45,6 +46,7 @@ import com.cloud.utils.db.UpdateBuilder; @Component public class SnapshotDataStoreDaoImpl extends GenericDaoBase<SnapshotDataStoreVO, Long> implements SnapshotDataStoreDao { + private static final Logger s_logger = Logger.getLogger(SnapshotDataStoreDaoImpl.class); private SearchBuilder<SnapshotDataStoreVO> updateStateSearch; private SearchBuilder<SnapshotDataStoreVO> storeSearch; private SearchBuilder<SnapshotDataStoreVO> destroyedSearch; @@ -138,7 +140,7 @@ public class SnapshotDataStoreDaoImpl extends GenericDaoBase<SnapshotDataStoreVO builder.set(dataObj, "updated", new Date()); int rows = update(dataObj, sc); - if (rows == 0 && logger.isDebugEnabled()) { + if (rows == 0 && s_logger.isDebugEnabled()) { SnapshotDataStoreVO dbVol = findByIdIncludingRemoved(dataObj.getId()); if (dbVol != null) { StringBuilder str = new StringBuilder("Unable to update ").append(dataObj.toString()); @@ -171,7 +173,7 @@ public class SnapshotDataStoreDaoImpl extends GenericDaoBase<SnapshotDataStoreVO .append("; updatedTime=") .append(oldUpdatedTime); } else { - logger.debug("Unable to update objectIndatastore: id=" + dataObj.getId() + ", as there is no such object exists in the database anymore"); + s_logger.debug("Unable to update objectIndatastore: id=" + dataObj.getId() + ", as there is no such object exists in the database anymore"); } } return rows > 0; @@ -232,7 +234,7 @@ public class SnapshotDataStoreDaoImpl extends GenericDaoBase<SnapshotDataStoreVO } } } catch (SQLException e) { - logger.debug("Failed to find latest snapshot for volume: " + volumeId + " due to: " + e.toString()); + s_logger.debug("Failed to find latest snapshot for volume: " + volumeId + " due to: " + e.toString()); } return null; } @@ -253,7 +255,7 @@ public class SnapshotDataStoreDaoImpl extends GenericDaoBase<SnapshotDataStoreVO } } } catch (SQLException e) { - logger.debug("Failed to find oldest snapshot for volume: " + volumeId + " due to: " + e.toString()); + s_logger.debug("Failed to find oldest snapshot for volume: " + volumeId + " due to: " + e.toString()); } return null; } @@ -276,7 +278,7 @@ public class SnapshotDataStoreDaoImpl extends GenericDaoBase<SnapshotDataStoreVO } } } catch (SQLException e) { - logger.debug("Failed to find parent snapshot: " + e.toString()); + s_logger.debug("Failed to find parent snapshot: " + e.toString()); } return null; } @@ -324,14 +326,14 @@ public class SnapshotDataStoreDaoImpl extends GenericDaoBase<SnapshotDataStoreVO List<SnapshotDataStoreVO> snapshots = listBy(sc); // create an entry for each record, but with empty install path since the content is not yet on region-wide store yet if (snapshots != null) { - logger.info("Duplicate " + snapshots.size() + " snapshot cache store records to region store"); + s_logger.info("Duplicate " + snapshots.size() + " snapshot cache store records to region store"); for (SnapshotDataStoreVO snap : snapshots) { SnapshotDataStoreVO snapStore = findByStoreSnapshot(DataStoreRole.Image, storeId, snap.getSnapshotId()); if (snapStore != null) { - logger.info("There is already entry for snapshot " + snap.getSnapshotId() + " on region store " + storeId); + s_logger.info("There is already entry for snapshot " + snap.getSnapshotId() + " on region store " + storeId); continue; } - logger.info("Persisting an entry for snapshot " + snap.getSnapshotId() + " on region store " + storeId); + s_logger.info("Persisting an entry for snapshot " + snap.getSnapshotId() + " on region store " + storeId); SnapshotDataStoreVO ss = new SnapshotDataStoreVO(); ss.setSnapshotId(snap.getSnapshotId()); ss.setDataStoreId(storeId); @@ -375,7 +377,7 @@ public class SnapshotDataStoreDaoImpl extends GenericDaoBase<SnapshotDataStoreVO sc.setParameters("destroyed", false); List<SnapshotDataStoreVO> snaps = listBy(sc); if (snaps != null) { - logger.info("Update to cache store role for " + snaps.size() + " entries in snapshot_store_ref"); + s_logger.info("Update to cache store role for " + snaps.size() + " entries in snapshot_store_ref"); for (SnapshotDataStoreVO snap : snaps) { snap.setRole(DataStoreRole.ImageCache); update(snap.getId(), snap); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java index 7f63261..066503b 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java @@ -26,6 +26,7 @@ import java.util.Map; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; @@ -55,6 +56,7 @@ import com.cloud.utils.exception.CloudRuntimeException; @Component public class TemplateDataStoreDaoImpl extends GenericDaoBase<TemplateDataStoreVO, Long> implements TemplateDataStoreDao { + private static final Logger s_logger = Logger.getLogger(TemplateDataStoreDaoImpl.class); private SearchBuilder<TemplateDataStoreVO> updateStateSearch; private SearchBuilder<TemplateDataStoreVO> storeSearch; private SearchBuilder<TemplateDataStoreVO> cacheSearch; @@ -172,7 +174,7 @@ public class TemplateDataStoreDaoImpl extends GenericDaoBase<TemplateDataStoreVO } int rows = update(dataObj, sc); - if (rows == 0 && logger.isDebugEnabled()) { + if (rows == 0 && s_logger.isDebugEnabled()) { TemplateDataStoreVO dbVol = findByIdIncludingRemoved(dataObj.getId()); if (dbVol != null) { StringBuilder str = new StringBuilder("Unable to update ").append(dataObj.toString()); @@ -205,7 +207,7 @@ public class TemplateDataStoreDaoImpl extends GenericDaoBase<TemplateDataStoreVO .append("; updatedTime=") .append(oldUpdatedTime); } else { - logger.debug("Unable to update objectIndatastore: id=" + dataObj.getId() + ", as there is no such object exists in the database anymore"); + s_logger.debug("Unable to update objectIndatastore: id=" + dataObj.getId() + ", as there is no such object exists in the database anymore"); } } return rows > 0; @@ -455,7 +457,7 @@ public class TemplateDataStoreDaoImpl extends GenericDaoBase<TemplateDataStoreVO List<TemplateDataStoreVO> tmpls = listBy(sc); // create an entry for each template record, but with empty install path since the content is not yet on region-wide store yet if (tmpls != null) { - logger.info("Duplicate " + tmpls.size() + " template cache store records to region store"); + s_logger.info("Duplicate " + tmpls.size() + " template cache store records to region store"); for (TemplateDataStoreVO tmpl : tmpls) { long templateId = tmpl.getTemplateId(); VMTemplateVO template = _tmpltDao.findById(templateId); @@ -463,15 +465,15 @@ public class TemplateDataStoreDaoImpl extends GenericDaoBase<TemplateDataStoreVO throw new CloudRuntimeException("No template is found for template id: " + templateId); } if (template.getTemplateType() == TemplateType.SYSTEM) { - logger.info("No need to duplicate system template since it will be automatically downloaded while adding region store"); + s_logger.info("No need to duplicate system template since it will be automatically downloaded while adding region store"); continue; } TemplateDataStoreVO tmpStore = findByStoreTemplate(storeId, tmpl.getTemplateId()); if (tmpStore != null) { - logger.info("There is already entry for template " + tmpl.getTemplateId() + " on region store " + storeId); + s_logger.info("There is already entry for template " + tmpl.getTemplateId() + " on region store " + storeId); continue; } - logger.info("Persisting an entry for template " + tmpl.getTemplateId() + " on region store " + storeId); + s_logger.info("Persisting an entry for template " + tmpl.getTemplateId() + " on region store " + storeId); TemplateDataStoreVO ts = new TemplateDataStoreVO(); ts.setTemplateId(tmpl.getTemplateId()); ts.setDataStoreId(storeId); @@ -506,7 +508,7 @@ public class TemplateDataStoreDaoImpl extends GenericDaoBase<TemplateDataStoreVO sc.setParameters("destroyed", false); List<TemplateDataStoreVO> tmpls = listBy(sc); if (tmpls != null) { - logger.info("Update to cache store role for " + tmpls.size() + " entries in template_store_ref"); + s_logger.info("Update to cache store role for " + tmpls.size() + " entries in template_store_ref"); for (TemplateDataStoreVO tmpl : tmpls) { tmpl.setDataStoreRole(DataStoreRole.ImageCache); update(tmpl.getId(), tmpl); @@ -535,7 +537,7 @@ public class TemplateDataStoreDaoImpl extends GenericDaoBase<TemplateDataStoreVO txn.commit(); } catch (Exception e) { txn.rollback(); - logger.warn("Failed expiring download urls for dcId: " + dcId, e); + s_logger.warn("Failed expiring download urls for dcId: " + dcId, e); } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java index bab9e2d..d01ec41 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/image/db/VolumeDataStoreDaoImpl.java @@ -25,6 +25,7 @@ import java.util.Map; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; @@ -47,6 +48,7 @@ import com.cloud.utils.db.UpdateBuilder; @Component public class VolumeDataStoreDaoImpl extends GenericDaoBase<VolumeDataStoreVO, Long> implements VolumeDataStoreDao { + private static final Logger s_logger = Logger.getLogger(VolumeDataStoreDaoImpl.class); private SearchBuilder<VolumeDataStoreVO> updateStateSearch; private SearchBuilder<VolumeDataStoreVO> volumeSearch; private SearchBuilder<VolumeDataStoreVO> storeSearch; @@ -139,7 +141,7 @@ public class VolumeDataStoreDaoImpl extends GenericDaoBase<VolumeDataStoreVO, Lo } int rows = update(dataObj, sc); - if (rows == 0 && logger.isDebugEnabled()) { + if (rows == 0 && s_logger.isDebugEnabled()) { VolumeDataStoreVO dbVol = findByIdIncludingRemoved(dataObj.getId()); if (dbVol != null) { StringBuilder str = new StringBuilder("Unable to update ").append(dataObj.toString()); @@ -172,7 +174,7 @@ public class VolumeDataStoreDaoImpl extends GenericDaoBase<VolumeDataStoreVO, Lo .append("; updatedTime=") .append(oldUpdatedTime); } else { - logger.debug("Unable to update objectIndatastore: id=" + dataObj.getId() + ", as there is no such object exists in the database anymore"); + s_logger.debug("Unable to update objectIndatastore: id=" + dataObj.getId() + ", as there is no such object exists in the database anymore"); } } return rows > 0; @@ -279,14 +281,14 @@ public class VolumeDataStoreDaoImpl extends GenericDaoBase<VolumeDataStoreVO, Lo } // create an entry for each record, but with empty install path since the content is not yet on region-wide store yet if (vols != null) { - logger.info("Duplicate " + vols.size() + " volume cache store records to region store"); + s_logger.info("Duplicate " + vols.size() + " volume cache store records to region store"); for (VolumeDataStoreVO vol : vols) { VolumeDataStoreVO volStore = findByStoreVolume(storeId, vol.getVolumeId()); if (volStore != null) { - logger.info("There is already entry for volume " + vol.getVolumeId() + " on region store " + storeId); + s_logger.info("There is already entry for volume " + vol.getVolumeId() + " on region store " + storeId); continue; } - logger.info("Persisting an entry for volume " + vol.getVolumeId() + " on region store " + storeId); + s_logger.info("Persisting an entry for volume " + vol.getVolumeId() + " on region store " + storeId); VolumeDataStoreVO vs = new VolumeDataStoreVO(); vs.setVolumeId(vol.getVolumeId()); vs.setDataStoreId(storeId); @@ -335,7 +337,7 @@ public class VolumeDataStoreDaoImpl extends GenericDaoBase<VolumeDataStoreVO, Lo txn.commit(); } catch (Exception e) { txn.rollback(); - logger.warn("Failed expiring download urls for dcId: " + dcId, e); + s_logger.warn("Failed expiring download urls for dcId: " + dcId, e); } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreDaoImpl.java b/engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreDaoImpl.java index 76f7f25..75838b0 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreDaoImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreDaoImpl.java @@ -20,6 +20,7 @@ package org.apache.cloudstack.storage.volume.db; import java.util.Date; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; @@ -35,6 +36,7 @@ import com.cloud.utils.db.UpdateBuilder; @Component public class TemplatePrimaryDataStoreDaoImpl extends GenericDaoBase<TemplatePrimaryDataStoreVO, Long> implements TemplatePrimaryDataStoreDao { + private static final Logger s_logger = Logger.getLogger(TemplatePrimaryDataStoreDaoImpl.class); protected final SearchBuilder<TemplatePrimaryDataStoreVO> updateSearchBuilder; public TemplatePrimaryDataStoreDaoImpl() { @@ -79,7 +81,7 @@ public class TemplatePrimaryDataStoreDaoImpl extends GenericDaoBase<TemplatePrim builder.set(vo, "lastUpdated", new Date()); int rows = update(vo, sc); - if (rows == 0 && logger.isDebugEnabled()) { + if (rows == 0 && s_logger.isDebugEnabled()) { TemplatePrimaryDataStoreVO template = findByIdIncludingRemoved(vo.getId()); if (template != null) { StringBuilder str = new StringBuilder("Unable to update ").append(vo.toString()); @@ -112,7 +114,7 @@ public class TemplatePrimaryDataStoreDaoImpl extends GenericDaoBase<TemplatePrim .append("; updatedTime=") .append(oldUpdatedTime); } else { - logger.debug("Unable to update template: id=" + vo.getId() + ", as there is no such template exists in the database anymore"); + s_logger.debug("Unable to update template: id=" + vo.getId() + ", as there is no such template exists in the database anymore"); } } return rows > 0; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/framework/cluster/src/com/cloud/cluster/ClusterFenceManagerImpl.java ---------------------------------------------------------------------- diff --git a/framework/cluster/src/com/cloud/cluster/ClusterFenceManagerImpl.java b/framework/cluster/src/com/cloud/cluster/ClusterFenceManagerImpl.java index c921f7f..3860ad4 100644 --- a/framework/cluster/src/com/cloud/cluster/ClusterFenceManagerImpl.java +++ b/framework/cluster/src/com/cloud/cluster/ClusterFenceManagerImpl.java @@ -23,6 +23,7 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.utils.component.ManagerBase; @@ -30,6 +31,7 @@ import com.cloud.utils.component.ManagerBase; @Component @Local(value = {ClusterFenceManager.class}) public class ClusterFenceManagerImpl extends ManagerBase implements ClusterFenceManager, ClusterManagerListener { + private static final Logger s_logger = Logger.getLogger(ClusterFenceManagerImpl.class); @Inject ClusterManager _clusterMgr; @@ -50,7 +52,7 @@ public class ClusterFenceManagerImpl extends ManagerBase implements ClusterFence @Override public void onManagementNodeIsolated() { - logger.error("Received node isolation notification, will perform self-fencing and shut myself down"); + s_logger.error("Received node isolation notification, will perform self-fencing and shut myself down"); System.exit(SELF_FENCING_EXIT_CODE); } }
