shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

Revert "feature #1678: Datastores report LN and CLONE target as SYSTEM, SELF or NONE"

Browse Source 
This reverts commit 7a02a4cf9667cf105242e19fa745378d3282c56b.

Conflicts:
	src/image/ImageManagerDriver.cc
This commit is contained in:
Carlos Martín 2013-10-22 17:52:23 +02:00
parent ed8aa715bd
commit ed368ed225
6 changed files with 3 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/datastore_mad/remotes/ceph/monitor
View File

@ -79,8 +79,6 @@ EOF
MONITOR_DATA=$(ssh_monitor_and_log $HOST "$MONITOR_SCRIPT" 2>&1)
MONITOR_STATUS=$?
MONITOR_DATA="$MONITOR_DATA LN_TARGET=NONE CLONE_TARGET=SELF"
if [ "$MONITOR_STATUS" = "0" ]; then
echo "$MONITOR_DATA" | tr ' ' '\n'
else

2
src/datastore_mad/remotes/dummy/monitor
View File

@ -19,5 +19,3 @@
echo "USED_MB=9720"
echo "TOTAL_MB=20480"
echo "FREE_MB=20480"
echo "LN_TARGET=NONE"
echo "CLONE_TARTGET=SYSTEM"

27
src/datastore_mad/remotes/fs/monitor
View File

@ -40,32 +40,13 @@ ID=$2
XPATH="${DRIVER_PATH}/../xpath.rb -b $DRV_ACTION"
unset i j XPATH_ELEMENTS
unset i XPATH_ELEMENTS
while IFS= read -r -d '' element; do
XPATH_ELEMENTS[i++]="$element"
done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/TM_MAD \
/DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH)
done < <($XPATH /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH)
TM_MAD="${XPATH_ELEMENTS[j++]}"
BASE_PATH="${XPATH_ELEMENTS[j++]}"
case $TM_MAD in
"ssh")
LN_TARGET="SYSTEM"
CLONE_TARGET="SYSTEM"
;;
"lvm_shared")
LN_TARGET="SYSTEM"
CLONE_TARGET="SYSTEM"
;;
*) #shared, qcow2
LN_TARGET="NONE"
CLONE_TARGET="SYSTEM"
;;
esac
BASE_PATH="${XPATH_ELEMENTS[0]}"
# ------------ Compute datastore usage -------------
@ -81,8 +62,6 @@ MONITOR_DATA=$(cat <<EOF
USED_MB=$USED_MB
TOTAL_MB=$TOTAL_MB
FREE_MB=$FREE_MB
LN_TARGET=$LN_TARGET
CLONE_TARGET=$CLONE_TARGET
EOF
)

2
src/datastore_mad/remotes/iscsi/monitor
View File

@ -78,8 +78,6 @@ EOF
MONITOR_DATA=$(ssh_monitor_and_log $HOST "$MONITOR_SCRIPT" 2>&1)
MONITOR_STATUS=$?
MONITOR_DATA="$MONITOR_DATA LN_TARGET=NONE CLONE_TARGET=SELF"
if [ "$MONITOR_STATUS" = "0" ]; then
echo "$MONITOR_DATA" | tr ' ' '\n'
else

2
src/datastore_mad/remotes/lvm/monitor
View File

@ -77,8 +77,6 @@ EOF
MONITOR_DATA=$(ssh_monitor_and_log $HOST "$MONITOR_SCRIPT" 2>&1)
MONITOR_STATUS=$?
MONITOR_DATA="$MONITOR_DATA LN_TARGET=NONE CLONE_TARGET=SELF"
if [ "$MONITOR_STATUS" = "0" ]; then
echo "$MONITOR_DATA" | tr ' ' '\n'
else

2
src/datastore_mad/remotes/vmfs/monitor
View File

@ -78,8 +78,6 @@ EOF
MONITOR_DATA=$(ssh_monitor_and_log $HOST "$MONITOR_SCRIPT" 2>&1)
MONITOR_STATUS=$?
MONITOR_DATA="$MONITOR_DATA LN_TARGET=NONE CLONE_TARGET=SYSTEM"
if [ "$MONITOR_STATUS" = "0" ]; then
echo "$MONITOR_DATA" | tr ' ' '\n'
else