Noam Slomianko has uploaded a new change for review. Change subject: engine: add enabled column to policy_units ......................................................................
engine: add enabled column to policy_units As part of the External scheduler integration: - Added "enabled" field to policy unit object, dao, and db This patch is meant to decrease the size and simplify the External Scheduler integration patch Change-Id: I6be407297c259aedf17283d2f674021cf0e4a135 Signed-off-by: Noam Slomianko <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/PolicyUnit.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/PolicyUnitDaoImpl.java A packaging/dbscripts/upgrade/03_03_0690_add_enabled_column_to_policy_unit.sql 3 files changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/17702/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/PolicyUnit.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/PolicyUnit.java index f3d8ca8..ea188a7 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/PolicyUnit.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/PolicyUnit.java @@ -33,6 +33,10 @@ * policy unit acceptable custom parameters; format <parameterName, regex> */ private Map<String, String> parameterRegExMap; + /** + * only for external units, marks if it exists on disk + */ + private boolean enabled = true; @Override public Object getQueryableId() { @@ -81,6 +85,14 @@ this.parameterRegExMap = parameterRegExMap; } + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + @Override public int hashCode() { final int prime = 31; @@ -90,6 +102,7 @@ result = prime * result + (internal ? 1231 : 1237); result = prime * result + ((name == null) ? 0 : name.hashCode()); result = prime * result + ((parameterRegExMap == null) ? 0 : parameterRegExMap.hashCode()); + result = prime * result + (enabled ? 1231 : 1237); return result; } @@ -121,7 +134,9 @@ return false; if (policyUnitType != other.policyUnitType) return false; + if (enabled != other.enabled) { + return false; + } return true; } - } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/PolicyUnitDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/PolicyUnitDaoImpl.java index bd572f4..7620825 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/PolicyUnitDaoImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/PolicyUnitDaoImpl.java @@ -28,7 +28,8 @@ : entity.getPolicyUnitType() .getValue()) .addValue("custom_properties_regex", - SerializationFactory.getSerializer().serialize(entity.getParameterRegExMap())); + SerializationFactory.getSerializer().serialize(entity.getParameterRegExMap())) + .addValue("enabled", entity.isEnabled()); } @Override @@ -49,6 +50,7 @@ policyUnit.setPolicyUnitType(PolicyUnitType.forValue(rs.getInt("type"))); policyUnit.setParameterRegExMap(SerializationFactory.getDeserializer() .deserializeOrCreateNew(rs.getString("custom_properties_regex"), LinkedHashMap.class)); + policyUnit.setEnabled(rs.getBoolean("enabled")); return policyUnit; } }; diff --git a/packaging/dbscripts/upgrade/03_03_0690_add_enabled_column_to_policy_unit.sql b/packaging/dbscripts/upgrade/03_03_0690_add_enabled_column_to_policy_unit.sql new file mode 100644 index 0000000..faf31fe --- /dev/null +++ b/packaging/dbscripts/upgrade/03_03_0690_add_enabled_column_to_policy_unit.sql @@ -0,0 +1 @@ +SELECT fn_db_add_column('policy_units', 'enabled', 'boolean'); -- To view, visit http://gerrit.ovirt.org/17702 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6be407297c259aedf17283d2f674021cf0e4a135 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Noam Slomianko <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
