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

logger issues

Browse Source
This commit is contained in:
Daan Hoogland 2024-04-23 12:47:48 +02:00
parent c31aebc188
commit 66c10bf42f
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
View File

@ -256,7 +256,7 @@ public class LinstorStorageAdaptor implements StorageAdaptor {
rdm.setOverrideProps(props); rdm.setOverrideProps(props);
ApiCallRcList answers = api.resourceDefinitionModify(rscName, rdm); ApiCallRcList answers = api.resourceDefinitionModify(rscName, rdm);
if (answers.hasError()) { 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 // do not fail here as adding allow-two-primaries property is only a problem while live migrating
} }
} }

2
plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java
View File

@ -200,7 +200,7 @@ public class LinstorUtil {
return rscs.stream() return rscs.stream()
.anyMatch(rsc -> rsc.getState() != null && Boolean.TRUE.equals(rsc.getState().isInUse())); .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; return false;
} }
} }

16
server/src/main/java/com/cloud/network/IpAddressManagerImpl.java
View File

@ -351,9 +351,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
if (possibleAddr.getState() != State.Free) { if (possibleAddr.getState() != State.Free) {
continue; continue;
} }
if (s_logger.isDebugEnabled()) { logger.debug("trying ip address {}", possibleAddr.getAddress());
s_logger.debug(String.format("trying ip address %s", possibleAddr.getAddress()));
}
possibleAddr.setSourceNat(sourceNat); possibleAddr.setSourceNat(sourceNat);
possibleAddr.setAllocatedTime(new Date()); possibleAddr.setAllocatedTime(new Date());
possibleAddr.setAllocatedInDomainId(owner.getDomainId()); possibleAddr.setAllocatedInDomainId(owner.getDomainId());
@ -396,19 +394,15 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
IPAddressVO finalAddress = null; IPAddressVO finalAddress = null;
IPAddressVO userIp = _ipAddressDao.acquireInLockTable(possibleAddr.getId()); IPAddressVO userIp = _ipAddressDao.acquireInLockTable(possibleAddr.getId());
if (userIp != null) { if (userIp != null) {
if (s_logger.isDebugEnabled()) { logger.debug("locked row for ip address {} (id: {})", possibleAddr.getAddress(), possibleAddr.getUuid());
s_logger.debug(String.format("locked row for ip address %s (id: %s)", possibleAddr.getAddress(), possibleAddr.getUuid()));
}
if (userIp.getState() == State.Free) { if (userIp.getState() == State.Free) {
possibleAddr.setState(State.Allocating); possibleAddr.setState(State.Allocating);
if (_ipAddressDao.update(possibleAddr.getId(), possibleAddr)) { 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; finalAddress = possibleAddr;
} }
} else { } else {
if (s_logger.isDebugEnabled()) { logger.debug("locked ip address {} is not free {}", possibleAddr.getAddress(), userIp.getState());
s_logger.debug(String.format("locked ip address %s is not free (%s)", possibleAddr.getAddress(), userIp.getState()));
}
} }
_ipAddressDao.releaseFromLockTable(possibleAddr.getId()); _ipAddressDao.releaseFromLockTable(possibleAddr.getId());
} }
@ -659,7 +653,7 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
if (!continueOnError) { if (!continueOnError) {
throw e; 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; success = false;
} }

2
services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java
View File

@ -3107,7 +3107,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S
} }
String extraOptions = extraOpts.toString(); String extraOptions = extraOpts.toString();
logger.debug("extraOpts now ", ()->StringUtils.cleanString(extraOptions)); logger.debug("extraOpts now {}", ()->StringUtils.cleanString(extraOptions));
if (!foundUser || !foundPswd) { if (!foundUser || !foundPswd) {
String errMsg = "Missing user and password from URI. Make sure they" + "are in the query string and separated by '&'. E.g. " String errMsg = "Missing user and password from URI. Make sure they" + "are in the query string and separated by '&'. E.g. "