Sahina Bose has uploaded a new change for review.
Change subject: engine: Added taskId to volume and brick
......................................................................
engine: Added taskId to volume and brick
Added taskId to GlusterVolumeEntity and GlusterBrickEntity to
store the gluster task id for long running operations.
Change-Id: I82247bac8217a81f52b16092637885a336e455d5
Signed-off-by: Sahina Bose <sab...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoDbFacadeImpl.java
A packaging/dbscripts/upgrade/03_03_0750_add_taskid_to_volumeandbricks.sql
5 files changed, 28 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/17992/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
index dfb0e7d..dace0c5 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
@@ -43,6 +43,8 @@
private BrickDetails brickDetails;
+ private Guid taskId = null;
+
public GlusterBrickEntity() {
}
@@ -94,6 +96,14 @@
this.status = status;
}
+ public Guid getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(Guid taskId) {
+ this.taskId = taskId;
+ }
+
public boolean isOnline() {
return status == GlusterStatus.UP;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java
index 30d1946..e0a9b66 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java
@@ -75,6 +75,8 @@
private Set<TransportType> transportTypes = new
LinkedHashSet<TransportType>();
+ private Guid taskId = null;
+
public GlusterVolumeEntity() {
}
@@ -159,6 +161,14 @@
this.stripeCount = stripeCount;
}
+ public Guid getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(Guid taskId) {
+ this.taskId = taskId;
+ }
+
public Set<AccessProtocol> getAccessProtocols() {
return accessProtocols;
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java
index d859808..309ae21 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterBrickDaoDbFacadeImpl.java
@@ -118,6 +118,7 @@
brick.setBrickDirectory(rs.getString("brick_dir"));
brick.setBrickOrder(rs.getInt("brick_order"));
brick.setStatus(GlusterStatus.valueOf(rs.getString("status")));
+ brick.setTaskId(getGuidDefaultEmpty(rs, "task_id"));
return brick;
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoDbFacadeImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoDbFacadeImpl.java
index bd83a10..e323ace 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoDbFacadeImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoDbFacadeImpl.java
@@ -299,6 +299,7 @@
entity.setStatus(GlusterStatus.valueOf(rs.getString("status")));
entity.setReplicaCount(rs.getInt("replica_count"));
entity.setStripeCount(rs.getInt("stripe_count"));
+ entity.setTaskId(getGuidDefaultEmpty(rs, "task_id"));
return entity;
}
}
diff --git
a/packaging/dbscripts/upgrade/03_03_0750_add_taskid_to_volumeandbricks.sql
b/packaging/dbscripts/upgrade/03_03_0750_add_taskid_to_volumeandbricks.sql
new file mode 100644
index 0000000..0748f59
--- /dev/null
+++ b/packaging/dbscripts/upgrade/03_03_0750_add_taskid_to_volumeandbricks.sql
@@ -0,0 +1,6 @@
+-- adding taskid column to gluster volumes used to store gluster task id
returned
+SELECT fn_db_add_column('gluster_volumes', 'task_id', 'uuid');
+
+-- adding taskid column to gluster volume bricks used to store gluster task id
returned
+SELECT fn_db_add_column('gluster_volume_bricks', 'task_id', 'uuid');
+
--
To view, visit http://gerrit.ovirt.org/17992
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82247bac8217a81f52b16092637885a336e455d5
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sahina Bose <sab...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
