Merge pull request #309 from vholer/bug-3705

B #3705 Allow DRIVER override on datastore level
This commit is contained in:
Javi Fontan authored and GitHub committed 2017-05-23 11:50:35 +02:00
commit 51bdcbdfe7
6 files changed
+111 -15

No files matched your search

+2 -1
View File
@@ -156,7 +156,8 @@ private:
const std::string& ln_target,
const std::string& clone_target,
const std::string& shared,
const std::string& ds_migrate);
const std::string& ds_migrate,
const std::string& driver);
/**
* Sets a the defaults for a Market
+5 -3
View File
@@ -990,11 +990,13 @@ TM_MAD_CONF = [
]
TM_MAD_CONF = [
NAME = "fs_lvm", LN_TARGET = "SYSTEM", CLONE_TARGET = "SYSTEM", SHARED="YES"
NAME = "fs_lvm", LN_TARGET = "SYSTEM", CLONE_TARGET = "SYSTEM", SHARED="YES",
DRIVER = "raw"
]
TM_MAD_CONF = [
NAME = "qcow2", LN_TARGET = "NONE", CLONE_TARGET = "SYSTEM", SHARED = "YES"
NAME = "qcow2", LN_TARGET = "NONE", CLONE_TARGET = "SYSTEM", SHARED = "YES",
DRIVER = "qcow2"
]
TM_MAD_CONF = [
@@ -1004,7 +1006,7 @@ TM_MAD_CONF = [
TM_MAD_CONF = [
NAME = "ceph", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES",
DS_MIGRATE = "NO"
DS_MIGRATE = "NO", DRIVER = "raw"
]
TM_MAD_CONF = [
+20
View File
@@ -107,6 +107,7 @@ void Datastore::disk_attribute(
string st;
string inherit_val;
string current_val;
string type;
vector<string>::const_iterator it;
@@ -147,6 +148,18 @@ void Datastore::disk_attribute(
{
disk->replace("DISK_TYPE", Image::disk_type_to_str(get_disk_type()));
}
type = disk->vector_value("TYPE");
if (type != "CDROM")
{
get_template_attribute("DRIVER", st);
if(!st.empty())
{
disk->replace("DRIVER", st);
}
}
}
/* ************************************************************************ */
@@ -335,6 +348,13 @@ int Datastore::set_tm_mad(string &tm_mad, string &error_str)
replace_template_attribute("CLONE_TARGET", st);
st = vatt->vector_value("DRIVER");
if (!st.empty())
{
replace_template_attribute("DRIVER", st);
}
remove_template_attribute("SHARED");
}
+35 -1
View File
@@ -59,7 +59,10 @@ done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/MD5 \
/DS_DRIVER_ACTION_DATA/IMAGE/TEMPLATE/SHA1 \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/NO_DECOMPRESS \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/LIMIT_TRANSFER_BW)
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/LIMIT_TRANSFER_BW \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/CONVERT \
/DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/DRIVER \
/DS_DRIVER_ACTION_DATA/IMAGE/TYPE)
unset i
@@ -74,6 +77,9 @@ MD5="${XPATH_ELEMENTS[i++]}"
SHA1="${XPATH_ELEMENTS[i++]}"
NO_DECOMPRESS="${XPATH_ELEMENTS[i++]}"
LIMIT_TRANSFER_BW="${XPATH_ELEMENTS[i++]}"
CONVERT="${XPATH_ELEMENTS[i++]:-yes}"
DRIVER="${XPATH_ELEMENTS[i++]}"
IMAGE_TYPE="${XPATH_ELEMENTS[i++]}"
DST=`generate_image_path`
IMAGE_HASH=`basename $DST`
@@ -85,6 +91,12 @@ if [ "$TYPE" = "2" ]; then
NO_DECOMPRESS="${NO_DECOMPRESS:-yes}"
fi
# Disable conversion for CD-ROM and 'files' datastores
CONVERT=$(echo "${CONVERT}" | $TR '[:upper:]' '[:lower:]')
if [ "$IMAGE_TYPE" = "1" ] || [ "$TYPE" = "2" ]; then
CONVERT=no
fi
if [ -n "$BRIDGE_LIST" ]; then
DOWNLOADER_ARGS=`set_downloader_args "$MD5" "$SHA1" "$NO_DECOMPRESS" "$LIMIT_TRANSFER_BW" "$SRC" -`
else
@@ -105,6 +117,19 @@ else
log "Downloading image $SRC to the image repository"
fi
CONVERT_CMD=$(cat <<EOF
set -e -o pipefail
FORMAT=\$($QEMU_IMG info $DST | grep "^file format:" | awk '{print \$3}' || :)
if [ "x$DRIVER" = 'xqcow2' ] || [ "x$DRIVER" = 'xraw' ]; then
if [ -n "\$FORMAT" ] && [ "x\$FORMAT" != "x$DRIVER" ]; then
$QEMU_IMG convert -O $DRIVER $DST $DST.tmp
mv $DST.tmp $DST
fi
fi
EOF
)
if [ -n "$BRIDGE_LIST" ]; then
DST_HOST=`get_destination_host $ID`
TMP_DST="$STAGING_DIR/$IMAGE_HASH"
@@ -114,9 +139,18 @@ if [ -n "$BRIDGE_LIST" ]; then
ssh_exec_and_log "$DST_HOST" "mkdir -p $BASE_PATH; mv -f $TMP_DST $DST" \
"Error moving $TMP_DST to $DST in $DST_HOST"
if [ "x$CONVERT" = 'xyes' ] && [ -n "$DRIVER" ]; then
ssh_exec_and_log "$DST_HOST" "$CONVERT_CMD" \
"Error converting $DST in $DST_HOST"
fi
else
mkdir -p "$BASE_PATH"
exec_and_log "$COPY_COMMAND" "Error copying $SRC to $DST"
if [ "x$CONVERT" = 'xyes' ] && [ -n "$DRIVER" ]; then
multiline_exec_and_log "$CONVERT_CMD" "Error converting $DST"
fi
fi
echo "$DST"
+12 -10
View File
@@ -123,15 +123,15 @@ void OpenNebulaTemplate::set_multiple_conf_default()
# dev
#*******************************************************************************
*/
set_conf_tm("dummy", "NONE", "SYSTEM", "YES", "YES");
set_conf_tm("lvm", "NONE", "SELF", "YES", "NO");
set_conf_tm("shared", "NONE", "SYSTEM", "YES", "YES");
set_conf_tm("fs_lvm", "SYSTEM", "SYSTEM", "YES", "NO");
set_conf_tm("qcow2", "NONE", "SYSTEM", "YES", "NO");
set_conf_tm("ssh", "SYSTEM", "SYSTEM", "NO", "YES");
set_conf_tm("vmfs", "NONE", "SYSTEM", "YES", "NO");
set_conf_tm("ceph", "NONE", "SELF", "YES", "NO");
set_conf_tm("dev", "NONE", "NONE", "YES", "NO");
set_conf_tm("dummy", "NONE", "SYSTEM", "YES", "YES", "");
set_conf_tm("lvm", "NONE", "SELF", "YES", "NO", "");
set_conf_tm("shared", "NONE", "SYSTEM", "YES", "YES", "");
set_conf_tm("fs_lvm", "SYSTEM", "SYSTEM", "YES", "NO", "raw");
set_conf_tm("qcow2", "NONE", "SYSTEM", "YES", "NO", "qcow2");
set_conf_tm("ssh", "SYSTEM", "SYSTEM", "NO", "YES", "");
set_conf_tm("vmfs", "NONE", "SYSTEM", "YES", "NO", "");
set_conf_tm("ceph", "NONE", "SELF", "YES", "NO", "raw");
set_conf_tm("dev", "NONE", "NONE", "YES", "NO", "");
register_multiple_conf_default("TM_MAD_CONF");
/*
@@ -301,7 +301,8 @@ void OpenNebulaTemplate::set_conf_tm(const std::string& name,
const std::string& ln_target,
const std::string& clone_target,
const std::string& shared,
const std::string& ds_migrate)
const std::string& ds_migrate,
const std::string& driver)
{
VectorAttribute * vattribute;
std::map<std::string,std::string> vvalue;
@@ -311,6 +312,7 @@ void OpenNebulaTemplate::set_conf_tm(const std::string& name,
vvalue.insert(make_pair("CLONE_TARGET", clone_target));
vvalue.insert(make_pair("SHARED", shared));
vvalue.insert(make_pair("DS_MIGRATE", ds_migrate));
vvalue.insert(make_pair("DRIVER", driver));
vattribute = new VectorAttribute("TM_MAD_CONF", vvalue);
conf_default.insert(make_pair(vattribute->name(), vattribute));
+37
View File
@@ -44,6 +44,8 @@ module Migrator
feature_2347()
bug_3705()
log_time()
return true
@@ -137,4 +139,39 @@ module Migrator
def feature_2347
create_table(:vmgroup_pool)
end
############################################################################
# Bug 3705
# Adds DRIVER to CEPH and LVM image datastores
############################################################################
def bug_3705
@db.run "ALTER TABLE datastore_pool RENAME TO old_datastore_pool;"
create_table(:datastore_pool)
@db.transaction do
@db.fetch("SELECT * FROM old_datastore_pool") do |row|
doc = Nokogiri::XML(row[:body], nil, NOKOGIRI_ENCODING) { |c|
c.default_xml.noblanks
}
type = xpath(doc, 'TYPE').to_i
tm_mad = xpath(doc, 'TM_MAD')
if (type == 0) && (["ceph", "fs_lvm"].include?(tm_mad))
doc.root.xpath("TEMPLATE/DRIVER").each do |d|
d.remove
end
driver = doc.create_element "DRIVER", "raw"
doc.root.at_xpath("TEMPLATE").add_child(driver)
row[:body] = doc.root.to_s
end
@db[:datastore_pool].insert(row)
end
end
@db.run "DROP TABLE old_datastore_pool;"
end
end