This is an automated email from the ASF dual-hosted git repository. dahn pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 66c10bf42fd0b217d14ef9a3cba427c0843a0513 Author: Daan Hoogland <[email protected]> AuthorDate: Tue Apr 23 12:47:48 2024 +0200 logger issues --- .../hypervisor/kvm/storage/LinstorStorageAdaptor.java | 2 +- .../cloudstack/storage/datastore/util/LinstorUtil.java | 2 +- .../java/com/cloud/network/IpAddressManagerImpl.java | 16 +++++----------- .../storage/resource/NfsSecondaryStorageResource.java | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java index 864a07801ae..c5537eb9dd8 100644 --- a/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java +++ b/plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java @@ -256,7 +256,7 @@ public class LinstorStorageAdaptor implements StorageAdaptor { rdm.setOverrideProps(props); ApiCallRcList answers = api.resourceDefinitionModify(rscName, rdm); if (answers.hasError()) { - s_logger.error("Unable to set 'allow-two-primaries' on " + rscName); + logger.error("Unable to set 'allow-two-primaries' on {} ", rscName); // do not fail here as adding allow-two-primaries property is only a problem while live migrating } } diff --git a/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java b/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java index 99310a478e8..aa6cb0e3989 100644 --- a/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java +++ b/plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java @@ -200,7 +200,7 @@ public class LinstorUtil { return rscs.stream() .anyMatch(rsc -> rsc.getState() != null && Boolean.TRUE.equals(rsc.getState().isInUse())); } - s_logger.error("isResourceInUse: null returned from resourceList"); + LOGGER.error("isResourceInUse: null returned from resourceList"); return false; } } diff --git a/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java index 1897a8271b8..6902068f8ef 100644 --- a/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java +++ b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java @@ -351,9 +351,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage if (possibleAddr.getState() != State.Free) { continue; } - if (s_logger.isDebugEnabled()) { - s_logger.debug(String.format("trying ip address %s", possibleAddr.getAddress())); - } + logger.debug("trying ip address {}", possibleAddr.getAddress()); possibleAddr.setSourceNat(sourceNat); possibleAddr.setAllocatedTime(new Date()); possibleAddr.setAllocatedInDomainId(owner.getDomainId()); @@ -396,19 +394,15 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage IPAddressVO finalAddress = null; IPAddressVO userIp = _ipAddressDao.acquireInLockTable(possibleAddr.getId()); if (userIp != null) { - if (s_logger.isDebugEnabled()) { - s_logger.debug(String.format("locked row for ip address %s (id: %s)", possibleAddr.getAddress(), possibleAddr.getUuid())); - } + logger.debug("locked row for ip address {} (id: {})", possibleAddr.getAddress(), possibleAddr.getUuid()); if (userIp.getState() == State.Free) { possibleAddr.setState(State.Allocating); if (_ipAddressDao.update(possibleAddr.getId(), possibleAddr)) { - s_logger.info(String.format("successfully allocated ip address %s", possibleAddr.getAddress())); + logger.info("successfully allocated ip address {}", possibleAddr.getAddress()); finalAddress = possibleAddr; } } else { - if (s_logger.isDebugEnabled()) { - s_logger.debug(String.format("locked ip address %s is not free (%s)", possibleAddr.getAddress(), userIp.getState())); - } + logger.debug("locked ip address {} is not free {}", possibleAddr.getAddress(), userIp.getState()); } _ipAddressDao.releaseFromLockTable(possibleAddr.getId()); } @@ -659,7 +653,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage if (!continueOnError) { throw e; } - logger.warn("Problems with applying " + purpose + " rules but pushing on", e); + logger.warn("Problems with applying {} rules but pushing on", purpose, e); success = false; } diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java index 074827a9852..6f2d4d23cf1 100644 --- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java +++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java @@ -3107,7 +3107,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S } String extraOptions = extraOpts.toString(); - logger.debug("extraOpts now ", ()->StringUtils.cleanString(extraOptions)); + logger.debug("extraOpts now {}", ()->StringUtils.cleanString(extraOptions)); if (!foundUser || !foundPswd) { String errMsg = "Missing user and password from URI. Make sure they" + "are in the query string and separated by '&'. E.g. "
