Allon Mureinik has posted comments on this change.
Change subject: engine:Validate maximum number of hosts in DC.(#771699)
......................................................................
Patch Set 4: I would prefer that you didn't submit this
(9 inline comments)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
Line 54: import org.ovirt.engine.core.utils.transaction.TransactionMethod;
Line 55: import org.ovirt.engine.core.utils.transaction.TransactionSupport;
Line 56:
Line 57: @NonTransactiveCommandAttribute(forceCompensation = true)
Line 58: @LockIdNameAttribute(isWait=true)
style: add spaces around the "=" operator.
Line 59: public class AddVdsCommand<T extends AddVdsActionParameters> extends
VdsCommand<T> {
Line 60:
Line 61: static {
Line 62: CommandParametersInitializer initializer = new
CommandParametersInitializer();
Line 309: returnValue = false;
Line 310: } else if (getVdsGroup().getstorage_pool_id() != null
Line 311: &&
reachedMaxNumOfVdsInPool(getVdsGroup().getstorage_pool_id().getValue())) {
Line 312:
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_EXCEEDED_MAXIMUM_NUMBER_OF_HOSTS_IN_DATA_CENTER);
Line 313: returnValue = false;
I'd move this check to the end - it's the only one that requires DB access in
this entire if-else-if branch, so better fail earlier on things it's easier to
check.
Line 314: } else {
Line 315: returnValue = returnValue &&
validateSingleHostAttachedToLocalStorage();
Line 316:
Line 317: if (Config.<Boolean>
GetValue(ConfigValues.UseSecureConnectionWithServers)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsCommand.java
Line 190: * @param storagePoolId - The storage pool id
Line 191: * @return True if number of hosts has exceeded, False otherwise.
Line 192: */
Line 193: protected boolean reachedMaxNumOfVdsInPool(Guid storagePoolId) {
Line 194: return (Config.<Integer>
GetValue(ConfigValues.MaxNumberOfHostsInStoragePool).equals(getVdsDAO().GetVdsCountByStoragePoolId(storagePoolId)));
1. Remove the brackets around the statement
2. You should not use equals, but ">=".
Consider the following scenario: I have a DC with 10 hosts. Then I change the
config value to allow a maximum of 9 hosts. Now I can add hosts infinitely,
without this test ever failing.
Line 195: }
Line 196:
Line 197: @Override
Line 198: public List<PermissionSubject> getPermissionCheckSubjects() {
....................................................
File
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java
Line 148: }
Line 149:
Line 150: @Override
Line 151: public Integer GetVdsCountByStoragePoolId(Guid storagePool) {
Line 152: ParameterizedRowMapper<Integer> mapper = new
ParameterizedRowMapper<Integer>() {
Take a look at DbFacade.GetSystemStatisticsValue - there's a similar RowMapper
there - perhaps you can reuse it.
Line 153: @Override
Line 154: public Integer mapRow(ResultSet rs, int rowNum) throws
SQLException {
Line 155: Integer result = rs.getInt(1);
Line 156: return result;
Line 150: @Override
Line 151: public Integer GetVdsCountByStoragePoolId(Guid storagePool) {
Line 152: ParameterizedRowMapper<Integer> mapper = new
ParameterizedRowMapper<Integer>() {
Line 153: @Override
Line 154: public Integer mapRow(ResultSet rs, int rowNum) throws
SQLException {
s/Integer/int/
Line 155: Integer result = rs.getInt(1);
Line 156: return result;
Line 157: }
Line 158: };
Line 156: return result;
Line 157: }
Line 158: };
Line 159:
Line 160: Map<String, Object> resultsMap =
getCallsHandler().executeReadAndReturnMap("GetVdsCountByStoragePoolId",
Just use executeRead
Line 161: mapper,
Line 162: getCustomMapSqlParameterSource()
Line 163: .addValue("storage_pool_id", storagePool)
Line 164: .addValue("user_id", null)
Line 161: mapper,
Line 162: getCustomMapSqlParameterSource()
Line 163: .addValue("storage_pool_id", storagePool)
Line 164: .addValue("user_id", null)
Line 165: .addValue("is_filtered", false));
If you're sending user_id and is_filtered hard coded, you can just remove them.
Either have them hardcoded inside the PSQL code, or have them passed by the
user in Java.
Line 166: return (Integer)((List<?>)resultsMap
Line 167: .get(BaseDAODbFacade.RETURN_VALUE_PARAMETER)).get(0);
Line 168: }
Line 169:
....................................................
File
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAO.java
Line 162: *
Line 163: * @param storagePool The storage pool's ID
Line 164: * @return vds count in the given storage pool
Line 165: */
Line 166: Integer GetVdsCountByStoragePoolId(Guid storagePool);
s/Integer/int/
s/GetVdsCountByStoragePoolId/getVdsCountByStoragePoolId/
Line 167: /**
Line 168: * Retrieves all VDS instances in the given Storage Pool, that
are in status "UP"
Line 169: * ordered by their vds_spm_priority, not including -1
Line 170: * @return the list of VDS instances
....................................................
File
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDAOTest.java
Line 345: * Asserts that the correct number hosts is returned for a
storage pool with hosts
Line 346: */
Line 347: @Test
Line 348: public void testGetVdsCountByStoragePoolId() {
Line 349: Integer result =
dao.GetVdsCountByStoragePoolId(existingVds.getstorage_pool_id());
Here too - once you change the API to use ints, you won't need all the Integer
mess here.
Line 350: assertNotNull(result);
Line 351: assertEquals(new
Integer(getAllForStoragePool(existingVds).size()), result);
Line 352: }
Line 353:
--
To view, visit http://gerrit.ovirt.org/6514
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie1ef2ce160bc9ee4855b310c9d170ef7c14a0a17
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <[email protected]>
Gerrit-Reviewer: Allon Mureinik <[email protected]>
Gerrit-Reviewer: Ayal Baron <[email protected]>
Gerrit-Reviewer: Daniel Erez <[email protected]>
Gerrit-Reviewer: Liron Aravot <[email protected]>
Gerrit-Reviewer: Maor Lipchuk <[email protected]>
Gerrit-Reviewer: Michael Kublin <[email protected]>
Gerrit-Reviewer: Omer Frenkel <[email protected]>
Gerrit-Reviewer: Tal Nisan <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
