This is an automated email from the ASF dual-hosted git repository. weizhou pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit fbeee491377e28e945ded7be94682bcd4a24bbbe Author: Wei Zhou <[email protected]> AuthorDate: Thu Jun 20 09:55:35 2024 +0200 fix build errors after forward-merge --- .../java/com/cloud/configuration/ConfigurationManager.java | 1 + .../apache/cloudstack/userdata/UserDataManagerImpl.java | 14 ++++++-------- .../hypervisor/xenserver/ExtraConfigurationUtility.java | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java b/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java index d078a86b06a..c877ebbe8d2 100644 --- a/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java +++ b/engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java @@ -21,6 +21,7 @@ import java.util.Map; import java.util.Set; import com.cloud.dc.VlanVO; +import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.impl.ConfigurationSubGroupVO; import com.cloud.dc.ClusterVO; diff --git a/engine/userdata/src/main/java/org/apache/cloudstack/userdata/UserDataManagerImpl.java b/engine/userdata/src/main/java/org/apache/cloudstack/userdata/UserDataManagerImpl.java index 81a77fa5c0b..664d308e28d 100644 --- a/engine/userdata/src/main/java/org/apache/cloudstack/userdata/UserDataManagerImpl.java +++ b/engine/userdata/src/main/java/org/apache/cloudstack/userdata/UserDataManagerImpl.java @@ -26,14 +26,12 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; import com.cloud.exception.InvalidParameterValueException; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.exception.CloudRuntimeException; public class UserDataManagerImpl extends ManagerBase implements UserDataManager { - private static final Logger s_logger = Logger.getLogger(UserDataManagerImpl.class); private static final int MAX_USER_DATA_LENGTH_BYTES = 2048; private static final int MAX_HTTP_GET_LENGTH = 2 * MAX_USER_DATA_LENGTH_BYTES; // 4KB private static final int NUM_OF_2K_BLOCKS = 512; @@ -89,9 +87,9 @@ public class UserDataManagerImpl extends ManagerBase implements UserDataManager @Override public String validateUserData(String userData, BaseCmd.HTTPMethod httpmethod) { - s_logger.trace(String.format("Validating base64 encoded user data: [%s].", userData)); + logger.trace(String.format("Validating base64 encoded user data: [%s].", userData)); if (StringUtils.isBlank(userData)) { - s_logger.debug("Null/empty base64 encoded user data set"); + logger.debug("Null/empty base64 encoded user data set"); return null; } @@ -126,17 +124,17 @@ public class UserDataManagerImpl extends ManagerBase implements UserDataManager throw new InvalidParameterValueException("User data is too short."); } - s_logger.trace(String.format("Decoded user data: [%s].", decodedUserData)); + logger.trace(String.format("Decoded user data: [%s].", decodedUserData)); int userDataLength = userData.length(); int decodedUserDataLength = decodedUserData.length; - s_logger.info(String.format("Configured base64 encoded user data size: %d bytes, actual user data size: %d bytes", userDataLength, decodedUserDataLength)); + logger.info(String.format("Configured base64 encoded user data size: %d bytes, actual user data size: %d bytes", userDataLength, decodedUserDataLength)); if (userDataLength > maxHTTPLength) { - s_logger.warn(String.format("Base64 encoded user data (size: %d bytes) too long for http %s request (accepted size: %d bytes)", userDataLength, httpMethod.toString(), maxHTTPLength)); + logger.warn(String.format("Base64 encoded user data (size: %d bytes) too long for http %s request (accepted size: %d bytes)", userDataLength, httpMethod.toString(), maxHTTPLength)); throw new InvalidParameterValueException(String.format("User data is too long for http %s request", httpMethod.toString())); } if (userDataLength > VM_USERDATA_MAX_LENGTH.value()) { - s_logger.warn(String.format("Base64 encoded user data (size: %d bytes) has exceeded configurable max length of %d bytes", userDataLength, VM_USERDATA_MAX_LENGTH.value())); + logger.warn(String.format("Base64 encoded user data (size: %d bytes) has exceeded configurable max length of %d bytes", userDataLength, VM_USERDATA_MAX_LENGTH.value())); throw new InvalidParameterValueException("User data has exceeded configurable max length: " + VM_USERDATA_MAX_LENGTH.value()); } diff --git a/plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/ExtraConfigurationUtility.java b/plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/ExtraConfigurationUtility.java index 94586af179a..97efbea02df 100644 --- a/plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/ExtraConfigurationUtility.java +++ b/plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/ExtraConfigurationUtility.java @@ -39,7 +39,7 @@ public class ExtraConfigurationUtility { // cfg is either param=value or map-param:key=value Pair<String, String> configParam = prepareKeyValuePair(cfg); if (configParam == null) { - LOG.warn("Invalid extra config passed: " + cfg); + LOGGER.warn("Invalid extra config passed: " + cfg); continue; }
