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

fix build errors after forward-merge

Browse Source
This commit is contained in:
Wei Zhou 2024-06-20 09:55:35 +02:00
parent d81ffd2d86
commit fbeee49137
No known key found for this signature in database
GPG Key ID: 1503DFE7C8226103
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/components-api/src/main/java/com/cloud/configuration/ConfigurationManager.java
View File

@ -21,6 +21,7 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import com.cloud.dc.VlanVO; import com.cloud.dc.VlanVO;
import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.config.impl.ConfigurationSubGroupVO; import org.apache.cloudstack.framework.config.impl.ConfigurationSubGroupVO;
import com.cloud.dc.ClusterVO; import com.cloud.dc.ClusterVO;

14
engine/userdata/src/main/java/org/apache/cloudstack/userdata/UserDataManagerImpl.java
View File

@ -26,14 +26,12 @@ import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.InvalidParameterValueException;
import com.cloud.utils.component.ManagerBase; import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.exception.CloudRuntimeException;
public class UserDataManagerImpl extends ManagerBase implements UserDataManager { 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_USER_DATA_LENGTH_BYTES = 2048;
private static final int MAX_HTTP_GET_LENGTH = 2 * MAX_USER_DATA_LENGTH_BYTES; // 4KB private static final int MAX_HTTP_GET_LENGTH = 2 * MAX_USER_DATA_LENGTH_BYTES; // 4KB
private static final int NUM_OF_2K_BLOCKS = 512; private static final int NUM_OF_2K_BLOCKS = 512;
@ -89,9 +87,9 @@ public class UserDataManagerImpl extends ManagerBase implements UserDataManager
@Override @Override
public String validateUserData(String userData, BaseCmd.HTTPMethod httpmethod) { 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)) { 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; return null;
} }
@ -126,17 +124,17 @@ public class UserDataManagerImpl extends ManagerBase implements UserDataManager
throw new InvalidParameterValueException("User data is too short."); 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 userDataLength = userData.length();
int decodedUserDataLength = decodedUserData.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) { 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())); throw new InvalidParameterValueException(String.format("User data is too long for http %s request", httpMethod.toString()));
} }
if (userDataLength > VM_USERDATA_MAX_LENGTH.value()) { 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()); throw new InvalidParameterValueException("User data has exceeded configurable max length: " + VM_USERDATA_MAX_LENGTH.value());
} }

2
plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/ExtraConfigurationUtility.java
View File

@ -39,7 +39,7 @@ public class ExtraConfigurationUtility {
// cfg is either param=value or map-param:key=value // cfg is either param=value or map-param:key=value
Pair<String, String> configParam = prepareKeyValuePair(cfg); Pair<String, String> configParam = prepareKeyValuePair(cfg);
if (configParam == null) { if (configParam == null) {
LOG.warn("Invalid extra config passed: " + cfg); LOGGER.warn("Invalid extra config passed: " + cfg);
continue; continue;
} }