From 554ea220f01a7c22f948a9b2e0e7cb6bb1c4f2d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Jandre?= <48719461+JoaoJandre@users.noreply.github.com> Date: Fri, 11 Oct 2024 14:12:18 -0300 Subject: [PATCH] Fix merge errors --- .../motion/StorageSystemDataMotionStrategy.java | 4 ++-- .../datastore/driver/CephObjectStoreDriverImpl.java | 13 +++++-------- .../lifecycle/CephObjectStoreLifeCycleImpl.java | 10 +++++----- .../java/org/apache/cloudstack/saml/SAMLUtils.java | 2 +- .../com/cloud/api/dispatch/ParamProcessWorker.java | 2 +- .../java/com/cloud/user/AccountManagerImpl.java | 4 ++-- .../cloud/api/dispatch/ParamProcessWorkerTest.java | 4 ++-- .../storage/formatinspector/Qcow2Inspector.java | 5 +++-- .../resource/NfsSecondaryStorageResource.java | 2 +- utils/src/main/java/com/cloud/utils/HttpUtils.java | 4 ++-- 10 files changed, 24 insertions(+), 26 deletions(-) diff --git a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java index 22a3bfbf93ac..ef6ded070b6a 100644 --- a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java +++ b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/StorageSystemDataMotionStrategy.java @@ -2171,11 +2171,11 @@ private MigrationOptions.Type decideMigrationTypeAndCopyTemplateIfNeeded(Host de srcVolumeInfo.getTemplateId() != null && Objects.nonNull(vmTemplate) && !Arrays.asList(KVM_VM_IMPORT_DEFAULT_TEMPLATE_NAME, VM_IMPORT_DEFAULT_TEMPLATE_NAME).contains(vmTemplate.getName())) { - LOGGER.debug(String.format("Copying template [%s] of volume [%s] from source storage pool [%s] to target storage pool [%s].", srcVolumeInfo.getTemplateId(), srcVolumeInfo.getId(), sourceStoragePool.getId(), destStoragePool.getId())); + logger.debug(String.format("Copying template [%s] of volume [%s] from source storage pool [%s] to target storage pool [%s].", srcVolumeInfo.getTemplateId(), srcVolumeInfo.getId(), sourceStoragePool.getId(), destStoragePool.getId())); copyTemplateToTargetFilesystemStorageIfNeeded(srcVolumeInfo, sourceStoragePool, destDataStore, destStoragePool, destHost); return MigrationOptions.Type.LinkedClone; } - LOGGER.debug(String.format("Skipping copy template from source storage pool [%s] to target storage pool [%s] before migration due to volume [%s] does not have a " + + logger.debug(String.format("Skipping copy template from source storage pool [%s] to target storage pool [%s] before migration due to volume [%s] does not have a " + "template or we are doing full clone migration.", sourceStoragePool.getId(), destStoragePool.getId(), srcVolumeInfo.getId())); return MigrationOptions.Type.FullClone; } diff --git a/plugins/storage/object/ceph/src/main/java/org/apache/cloudstack/storage/datastore/driver/CephObjectStoreDriverImpl.java b/plugins/storage/object/ceph/src/main/java/org/apache/cloudstack/storage/datastore/driver/CephObjectStoreDriverImpl.java index 6fece40e6ac5..b2e1d23917b3 100644 --- a/plugins/storage/object/ceph/src/main/java/org/apache/cloudstack/storage/datastore/driver/CephObjectStoreDriverImpl.java +++ b/plugins/storage/object/ceph/src/main/java/org/apache/cloudstack/storage/datastore/driver/CephObjectStoreDriverImpl.java @@ -46,8 +46,6 @@ import org.apache.cloudstack.storage.datastore.db.ObjectStoreVO; import org.apache.cloudstack.storage.object.BaseObjectStoreDriverImpl; import org.apache.cloudstack.storage.object.BucketObject; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.twonote.rgwadmin4j.RgwAdmin; import org.twonote.rgwadmin4j.RgwAdminBuilder; import org.twonote.rgwadmin4j.model.BucketInfo; @@ -62,7 +60,6 @@ import java.util.HashMap; public class CephObjectStoreDriverImpl extends BaseObjectStoreDriverImpl { - private static final Logger s_logger = LogManager.getLogger(CephObjectStoreDriverImpl.class); @Inject AccountDao _accountDao; @@ -168,7 +165,7 @@ public void setBucketPolicy(BucketTO bucket, String policy, long storeId) { String policyConfig; if (policy.equalsIgnoreCase("public")) { - s_logger.debug("Setting public policy on bucket " + bucket.getName()); + logger.debug("Setting public policy on bucket " + bucket.getName()); StringBuilder builder = new StringBuilder(); builder.append("{\n"); builder.append(" \"Statement\": [\n"); @@ -192,7 +189,7 @@ public void setBucketPolicy(BucketTO bucket, String policy, long storeId) { builder.append("}\n"); policyConfig = builder.toString(); } else { - s_logger.debug("Setting private policy on bucket " + bucket.getName()); + logger.debug("Setting private policy on bucket " + bucket.getName()); policyConfig = "{\"Version\":\"2012-10-17\",\"Statement\":[]}"; } @@ -218,15 +215,15 @@ public boolean createUser(long accountId, long storeId) { RgwAdmin rgwAdmin = getRgwAdminClient(storeId); String username = account.getUuid(); - s_logger.debug("Attempting to create Ceph RGW user for account " + account.getAccountName() + " with UUID " + username); + logger.debug("Attempting to create Ceph RGW user for account " + account.getAccountName() + " with UUID " + username); try { Optional user = rgwAdmin.getUserInfo(username); if (user.isPresent()) { - s_logger.info("User already exists in Ceph RGW: " + username); + logger.info("User already exists in Ceph RGW: " + username); return true; } } catch (Exception e) { - s_logger.debug("User does not exist. Creating user in Ceph RGW: " + username); + logger.debug("User does not exist. Creating user in Ceph RGW: " + username); } try { diff --git a/plugins/storage/object/ceph/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CephObjectStoreLifeCycleImpl.java b/plugins/storage/object/ceph/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CephObjectStoreLifeCycleImpl.java index a9b13bf338eb..8740d188ce07 100644 --- a/plugins/storage/object/ceph/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CephObjectStoreLifeCycleImpl.java +++ b/plugins/storage/object/ceph/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/CephObjectStoreLifeCycleImpl.java @@ -39,7 +39,7 @@ public class CephObjectStoreLifeCycleImpl implements ObjectStoreLifeCycle { - private static final Logger s_logger = LogManager.getLogger(CephObjectStoreLifeCycleImpl.class); + private Logger logger = LogManager.getLogger(CephObjectStoreLifeCycleImpl.class); @Inject ObjectStoreHelper objectStoreHelper; @@ -72,7 +72,7 @@ public DataStore initialize(Map dsInfos) { objectStoreParameters.put("accesskey", accessKey); objectStoreParameters.put("secretkey", secretKey); - s_logger.info("Attempting to connect to Ceph RGW at " + url + " with access key " + accessKey); + logger.info("Attempting to connect to Ceph RGW at " + url + " with access key " + accessKey); RgwAdmin rgwAdmin = new RgwAdminBuilder() .accessKey(accessKey) @@ -81,10 +81,10 @@ public DataStore initialize(Map dsInfos) { .build(); try { List buckets = rgwAdmin.listBucket(); - s_logger.debug("Found " + buckets + " buckets at Ceph RGW: " + url); - s_logger.info("Successfully connected to Ceph RGW: " + url); + logger.debug("Found " + buckets + " buckets at Ceph RGW: " + url); + logger.info("Successfully connected to Ceph RGW: " + url); } catch (Exception e) { - s_logger.debug("Error while initializing Ceph RGW Object Store: " + e.getMessage()); + logger.debug("Error while initializing Ceph RGW Object Store: " + e.getMessage()); throw new RuntimeException("Error while initializing Ceph RGW Object Store. Invalid credentials or URL"); } diff --git a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLUtils.java b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLUtils.java index 6efe454a7924..2648ad0eaed7 100644 --- a/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLUtils.java +++ b/plugins/user-authenticators/saml2/src/main/java/org/apache/cloudstack/saml/SAMLUtils.java @@ -319,7 +319,7 @@ public static void setupSamlUserCookies(final LoginCmdResponse loginResponse, fi } String sameSite = ApiServlet.getApiSessionKeySameSite(); String sessionKeyCookie = String.format("%s=%s;Domain=%s;Path=%s;%s", ApiConstants.SESSIONKEY, loginResponse.getSessionKey(), domain, path, sameSite); - s_logger.debug("Adding sessionkey cookie to response: " + sessionKeyCookie); + LOGGER.debug("Adding sessionkey cookie to response: " + sessionKeyCookie); resp.addHeader("SET-COOKIE", sessionKeyCookie); } diff --git a/server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java b/server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java index 16b9673f198d..c4145755b560 100644 --- a/server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java +++ b/server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java @@ -310,7 +310,7 @@ public void processParameters(final BaseCmd cmd, final Map params) { doAccessChecks(cmd, entitiesToAccess); } - private void doAccessChecks(BaseCmd cmd, Map entitiesToAccess) { + protected void doAccessChecks(BaseCmd cmd, Map entitiesToAccess) { Account caller = CallContext.current().getCallingAccount(); List entityOwners = cmd.getEntityOwnerIds(); Account[] owners = null; diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java b/server/src/main/java/com/cloud/user/AccountManagerImpl.java index 101c3e0d4148..39e8518f7607 100644 --- a/server/src/main/java/com/cloud/user/AccountManagerImpl.java +++ b/server/src/main/java/com/cloud/user/AccountManagerImpl.java @@ -749,9 +749,9 @@ public void validateAccountHasAccessToResource(Account account, AccessType acces } else if (Domain.class.isAssignableFrom(resourceClass)) { checkAccess(account, (Domain) resource); } else if (InfrastructureEntity.class.isAssignableFrom(resourceClass)) { - s_logger.trace("Validation of access to infrastructure entity has been disabled in CloudStack version 4.4."); + logger.trace("Validation of access to infrastructure entity has been disabled in CloudStack version 4.4."); } - s_logger.debug(String.format("Account [%s] has access to resource.", account.getUuid())); + logger.debug(String.format("Account [%s] has access to resource.", account.getUuid())); } @Override diff --git a/server/src/test/java/com/cloud/api/dispatch/ParamProcessWorkerTest.java b/server/src/test/java/com/cloud/api/dispatch/ParamProcessWorkerTest.java index a1c97e21d5be..a998d2e9ab45 100644 --- a/server/src/test/java/com/cloud/api/dispatch/ParamProcessWorkerTest.java +++ b/server/src/test/java/com/cloud/api/dispatch/ParamProcessWorkerTest.java @@ -174,7 +174,7 @@ public void processVmHostNameParameter_NotMoreThan63Chars() { @Test public void doAccessChecksTestChecksCallerAccessToOwnerWhenCmdExtendsBaseAsyncCreateCmd() { - Mockito.doReturn(owners).when(paramProcessWorkerSpy).getEntityOwners(Mockito.any()); + Mockito.lenient().doReturn(owners).when(paramProcessWorkerSpy).getEntityOwners(Mockito.any()); Mockito.doNothing().when(paramProcessWorkerSpy).checkCallerAccessToEntities(Mockito.any(), Mockito.any(), Mockito.any()); paramProcessWorkerSpy.doAccessChecks(new AssociateIPAddrCmd(), entities); @@ -184,7 +184,7 @@ public void doAccessChecksTestChecksCallerAccessToOwnerWhenCmdExtendsBaseAsyncCr @Test public void doAccessChecksTestChecksCallerAccessToEntities() { - Mockito.doReturn(owners).when(paramProcessWorkerSpy).getEntityOwners(Mockito.any()); + Mockito.lenient().doReturn(owners).when(paramProcessWorkerSpy).getEntityOwners(Mockito.any()); Mockito.doNothing().when(paramProcessWorkerSpy).checkCallerAccessToEntities(Mockito.any(), Mockito.any(), Mockito.any()); paramProcessWorkerSpy.doAccessChecks(new AssociateIPAddrCmd(), entities); diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/formatinspector/Qcow2Inspector.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/formatinspector/Qcow2Inspector.java index 1ad2076a12d1..9d80064d292e 100644 --- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/formatinspector/Qcow2Inspector.java +++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/formatinspector/Qcow2Inspector.java @@ -19,7 +19,8 @@ import com.cloud.utils.NumbersUtil; import org.apache.commons.lang3.ArrayUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.io.FileInputStream; import java.io.IOException; @@ -42,7 +43,7 @@ * and on the OpenStack's Cinder implementation for Python. */ public class Qcow2Inspector { - protected static Logger LOGGER = Logger.getLogger(Qcow2Inspector.class); + protected static Logger LOGGER = LogManager.getLogger(Qcow2Inspector.class); private static final byte[] QCOW_MAGIC_STRING = ArrayUtils.add("QFI".getBytes(), (byte) 0xfb); private static final int INCOMPATIBLE_FEATURES_MAX_KNOWN_BIT = 4; 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 4226ec241127..4cd4e8caa305 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 @@ -3489,7 +3489,7 @@ public String postUpload(String uuid, String filename, long processTimeout) { try { Qcow2Inspector.validateQcow2File(finalFilename); } catch (RuntimeException e) { - s_logger.error(String.format("Uploaded file [%s] is not a valid QCOW2.", finalFilename), e); + logger.error(String.format("Uploaded file [%s] is not a valid QCOW2.", finalFilename), e); return "The uploaded file is not a valid QCOW2. Ask the administrator to check the logs for more details."; } } diff --git a/utils/src/main/java/com/cloud/utils/HttpUtils.java b/utils/src/main/java/com/cloud/utils/HttpUtils.java index 0da520789520..299f21633ab1 100644 --- a/utils/src/main/java/com/cloud/utils/HttpUtils.java +++ b/utils/src/main/java/com/cloud/utils/HttpUtils.java @@ -119,12 +119,12 @@ public static boolean validateSessionKey(final HttpSession session, final Map