[libvirt] [PATCH v6 07/13] virstoragefile: Add quorum in virstoragefile
Matthias Gatto
matthias.gatto at outscale.com
Thu Oct 29 13:43:14 UTC 2015
Add VIR_STORAGE_TYPE_QUORUM in virStorageType.
Add VIR_STORAGE_FILE_QUORUM in virStorageFileFormat.
Add threshold value in _virStorageSource
Signed-off-by: Matthias Gatto <matthias.gatto at outscale.com>
---
docs/formatdomain.html.in | 23 ++++++++++++++++++++---
docs/schemas/domaincommon.rng | 21 ++++++++++++++++++++-
docs/schemas/storagecommon.rng | 1 +
docs/schemas/storagevol.rng | 1 +
src/conf/domain_conf.c | 2 ++
src/qemu/qemu_command.c | 1 +
src/qemu/qemu_driver.c | 4 ++++
src/qemu/qemu_migration.c | 1 +
src/util/virstoragefile.c | 25 +++++++++++++++++--------
src/util/virstoragefile.h | 3 +++
10 files changed, 70 insertions(+), 12 deletions(-)
diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index c88b032..a52b60b 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1958,8 +1958,9 @@
<dd>
Valid values are "file", "block",
"dir" (<span class="since">since 0.7.5</span>),
- "network" (<span class="since">since 0.8.7</span>), or
- "volume" (<span class="since">since 1.0.5</span>)
+ "network" (<span class="since">since 0.8.7</span>),
+ "volume" (<span class="since">since 1.0.5</span>), or
+ "quorum" (<span class="since">since 1.2.21</span>)
and refer to the underlying source for the disk.
</dd>
<dt><code>device</code> attribute
@@ -2025,6 +2026,14 @@
<code>snapshot='yes'</code> with a transient disk generally
does not make sense.
</dd>
+ <dt><code>threshold</code> attribute
+ <span class="since">since 1.2.21</span></dt>
+ <dd>
+ Only use with a quorum disk.
+ Indicate the minimum of positive vote a quorum must have to validate
+ a data to be write. The minimum value is "2". The number of backingStores
+ contain by the quorum must be superior to the threshold.
+ </dd>
</dl>
</dd>
<dt><code>source</code></dt>
@@ -2102,6 +2111,11 @@
</p>
</dd>
+ <dt><code>type='quorum'</code>
+ <span class="since">since 1.2.21</span></dt>
+ <dd>
+ A quorum contain no source element, but a serie of backingStores instead.
+ </dd>
</dl>
With "file", "block", and "volume", one or more optional
sub-elements <code>seclabel</code>, <a href="#seclabel">described
@@ -2241,7 +2255,10 @@
property, but using existing external files for snapshot or
block copy operations requires the end user to pre-create the
file correctly). The following attributes and sub-elements are
- supported in <code>backingStore</code>:
+ supported in.
+ <span class="since">Since 1.2.21</span>. This elements is used to
+ describe a quorum child.
+ <code>backingStore</code>:
<dl>
<dt><code>type</code> attribute</dt>
<dd>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index f196177..067140b 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1240,9 +1240,15 @@
</interleave>
</define>
+ <define name="diskBackingStoreArray">
+ <zeroOrMore>
+ <ref name="diskBackingStore"/>
+ </zeroOrMore>
+ </define>
+
<define name="diskBackingChain">
<choice>
- <ref name="diskBackingStore"/>
+ <ref name="diskBackingStoreArray"/>
<ref name="diskBackingStoreLast"/>
</choice>
</define>
@@ -1284,9 +1290,22 @@
<ref name="diskSourceDir"/>
<ref name="diskSourceNetwork"/>
<ref name="diskSourceVolume"/>
+ <ref name="diskSourceQuorum"/>
</choice>
</define>
+ <define name="diskSourceQuorum">
+ <optional>
+ <attribute name="type">
+ <value>quorum</value>
+ </attribute>
+ <attribute name="threshold">
+ <ref name="unsignedInt"/>
+ </attribute>
+ </optional>
+ </define>
+
+
<define name="diskSourceFile">
<optional>
<attribute name="type">
diff --git a/docs/schemas/storagecommon.rng b/docs/schemas/storagecommon.rng
index 7c04462..0ebc2ef 100644
--- a/docs/schemas/storagecommon.rng
+++ b/docs/schemas/storagecommon.rng
@@ -76,6 +76,7 @@
<value>fat</value>
<value>vhd</value>
<value>ploop</value>
+ <value>quorum</value>
<ref name='storageFormatBacking'/>
</choice>
</define>
diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng
index 7450547..a718576 100644
--- a/docs/schemas/storagevol.rng
+++ b/docs/schemas/storagevol.rng
@@ -20,6 +20,7 @@
<value>dir</value>
<value>network</value>
<value>netdir</value>
+ <value>quorum</value>
</choice>
</attribute>
</optional>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 101cfeb..ce8edef 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6583,6 +6583,7 @@ virDomainDiskSourceParse(xmlNodePtr node,
if (virDomainDiskSourcePoolDefParse(node, &src->srcpool) < 0)
goto cleanup;
break;
+ case VIR_STORAGE_TYPE_QUORUM:
case VIR_STORAGE_TYPE_NONE:
case VIR_STORAGE_TYPE_LAST:
virReportError(VIR_ERR_INTERNAL_ERROR,
@@ -18837,6 +18838,7 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
skipSeclabels);
break;
+ case VIR_STORAGE_TYPE_QUORUM:
case VIR_STORAGE_TYPE_NONE:
case VIR_STORAGE_TYPE_LAST:
virReportError(VIR_ERR_INTERNAL_ERROR,
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 8824541..50cf8cc 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3534,6 +3534,7 @@ qemuGetDriveSourceString(virStorageSourcePtr src,
goto cleanup;
break;
+ case VIR_STORAGE_TYPE_QUORUM:
case VIR_STORAGE_TYPE_VOLUME:
case VIR_STORAGE_TYPE_NONE:
case VIR_STORAGE_TYPE_LAST:
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index cbc508c..193c25d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13782,6 +13782,7 @@ qemuDomainSnapshotPrepareDiskExternalBackingInactive(virDomainDiskDefPtr disk)
}
break;
+ case VIR_STORAGE_TYPE_QUORUM:
case VIR_STORAGE_TYPE_DIR:
case VIR_STORAGE_TYPE_VOLUME:
case VIR_STORAGE_TYPE_NONE:
@@ -13845,6 +13846,7 @@ qemuDomainSnapshotPrepareDiskExternalOverlayActive(virDomainSnapshotDiskDefPtr d
}
break;
+ case VIR_STORAGE_TYPE_QUORUM:
case VIR_STORAGE_TYPE_DIR:
case VIR_STORAGE_TYPE_VOLUME:
case VIR_STORAGE_TYPE_NONE:
@@ -13869,6 +13871,7 @@ qemuDomainSnapshotPrepareDiskExternalOverlayInactive(virDomainSnapshotDiskDefPtr
case VIR_STORAGE_TYPE_FILE:
return 0;
+ case VIR_STORAGE_TYPE_QUORUM:
case VIR_STORAGE_TYPE_NETWORK:
case VIR_STORAGE_TYPE_DIR:
case VIR_STORAGE_TYPE_VOLUME:
@@ -13988,6 +13991,7 @@ qemuDomainSnapshotPrepareDiskInternal(virConnectPtr conn,
}
break;
+ case VIR_STORAGE_TYPE_QUORUM:
case VIR_STORAGE_TYPE_DIR:
case VIR_STORAGE_TYPE_VOLUME:
case VIR_STORAGE_TYPE_NONE:
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 2abf2ee..06222a2 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1553,6 +1553,7 @@ qemuMigrationPrecreateDisk(virConnectPtr conn,
case VIR_STORAGE_TYPE_BLOCK:
case VIR_STORAGE_TYPE_DIR:
+ case VIR_STORAGE_TYPE_QUORUM:
case VIR_STORAGE_TYPE_NONE:
case VIR_STORAGE_TYPE_LAST:
virReportError(VIR_ERR_INTERNAL_ERROR,
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index a9cc0c8..b106e73 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -54,7 +54,8 @@ VIR_ENUM_IMPL(virStorage, VIR_STORAGE_TYPE_LAST,
"block",
"dir",
"network",
- "volume")
+ "volume",
+ "quorum")
VIR_ENUM_IMPL(virStorageFileFormat,
VIR_STORAGE_FILE_LAST,
@@ -63,7 +64,7 @@ VIR_ENUM_IMPL(virStorageFileFormat,
"cloop", "dmg", "iso",
"vpc", "vdi",
/* Not direct file formats, but used for various drivers */
- "fat", "vhd", "ploop",
+ "fat", "vhd", "ploop", "quorum",
/* Formats with backing file below here */
"cow", "qcow", "qcow2", "qed", "vmdk")
@@ -1895,6 +1896,7 @@ virStorageSourceCopy(const virStorageSource *src,
bool backingChain)
{
virStorageSourcePtr ret = NULL;
+ size_t i;
if (VIR_ALLOC(ret) < 0)
return NULL;
@@ -1907,6 +1909,8 @@ virStorageSourceCopy(const virStorageSource *src,
ret->physical = src->physical;
ret->readonly = src->readonly;
ret->shared = src->shared;
+ ret->nBackingStores = src->nBackingStores;
+ ret->threshold = src->threshold;
/* storage driver metadata are not copied */
ret->drv = NULL;
@@ -1955,12 +1959,14 @@ virStorageSourceCopy(const virStorageSource *src,
!(ret->auth = virStorageAuthDefCopy(src->auth)))
goto error;
- if (backingChain && virStorageSourceGetBackingStore(src, 0)) {
- if (!virStorageSourceSetBackingStore(ret,
- virStorageSourceCopy(virStorageSourceGetBackingStore(src, 0),
- true),
- 0))
- goto error;
+ for (i = 0; i < src->nBackingStores; ++i) {
+ if (backingChain && virStorageSourceGetBackingStore(src, i)) {
+ if (!virStorageSourceSetBackingStore(ret,
+ virStorageSourceCopy(virStorageSourceGetBackingStore(src, i),
+ true),
+ 0))
+ goto error;
+ }
}
return ret;
@@ -2044,6 +2050,9 @@ virStorageSourceIsLocalStorage(virStorageSourcePtr src)
case VIR_STORAGE_TYPE_FILE:
case VIR_STORAGE_TYPE_BLOCK:
case VIR_STORAGE_TYPE_DIR:
+ /* A quorum is actually both, but we consider it as local
+ * because it keep us to add a lot of exeption in the code*/
+ case VIR_STORAGE_TYPE_QUORUM:
return true;
case VIR_STORAGE_TYPE_NETWORK:
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index c9f2afa..3a73bb2 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -49,6 +49,7 @@ typedef enum {
VIR_STORAGE_TYPE_DIR,
VIR_STORAGE_TYPE_NETWORK,
VIR_STORAGE_TYPE_VOLUME,
+ VIR_STORAGE_TYPE_QUORUM,
VIR_STORAGE_TYPE_LAST
} virStorageType;
@@ -73,6 +74,7 @@ typedef enum {
VIR_STORAGE_FILE_FAT,
VIR_STORAGE_FILE_VHD,
VIR_STORAGE_FILE_PLOOP,
+ VIR_STORAGE_FILE_QUORUM,
/* Not a format, but a marker: all formats below this point have
* libvirt support for following a backing chain */
@@ -272,6 +274,7 @@ struct _virStorageSource {
/* backing chain of the storage source */
virStorageSourcePtr *backingStores;
size_t nBackingStores;
+ size_t threshold;
/* metadata for storage driver access to remote and local volumes */
virStorageDriverDataPtr drv;
--
2.6.1
More information about the libvir-list
mailing list