Skip to content

Commit 2fa5206

Browse files
committed
Add CowUtil class
Signed-off-by: Ronan Abhamon <ronan.abhamon@vates.tech>
1 parent a5033ed commit 2fa5206

44 files changed

Lines changed: 2338 additions & 1708 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,12 @@ SM_LIBS += util
3434
SM_LIBS += verifyVHDsOnSR
3535
SM_LIBS += scsiutil
3636
SM_LIBS += scsi_host_rescan
37+
SM_LIBS += cowutil
3738
SM_LIBS += vhdutil
39+
SM_LIBS += linstorcowutil
3840
SM_LIBS += linstorjournaler
39-
SM_LIBS += linstorvhdutil
4041
SM_LIBS += linstorvolumemanager
41-
SM_LIBS += lvhdutil
42+
SM_LIBS += lvmcowutil
4243
SM_LIBS += cifutils
4344
SM_LIBS += xs_errors
4445
SM_LIBS += nfs
@@ -203,7 +204,7 @@ install: build
203204
ln -sf $$i"SR.py" $$i"SR"; \
204205
done
205206
rm $(SM_STAGING)$(SM_DEST)/SHMSR
206-
cd $(SM_STAGING)$(SM_DEST) && rm -f LVMSR && ln -sf LVMSR.py LVHDSR
207+
cd $(SM_STAGING)$(SM_DEST) && rm -f LVMSR && ln -sf LVMSR.py LVMSR
207208
cd $(SM_STAGING)$(SM_DEST) && rm -f RawISCSISR && ln -sf RawISCSISR.py ISCSISR
208209
cd $(SM_STAGING)$(SM_DEST) && rm -f LVMoISCSISR && ln -sf LVMoISCSISR.py LVMoISCSISR
209210
cd $(SM_STAGING)$(SM_DEST) && rm -f LVMoHBASR && ln -sf LVMoHBASR.py LVMoHBASR

drivers/02-vhdcleanup

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
. /etc/init.d/functions
2222

2323
CLEANUP_SCRIPT="/opt/xensource/sm/cleanup.py"
24-
LVHD_UTIL_SCRIPT="/opt/xensource/sm/lvhdutil.py"
24+
LVM_COW_UTIL_SCRIPT="/opt/xensource/sm/lvmcowutil.py"
2525

2626
start() {
2727
echo -n $"Fixing refcounts on new master: "
@@ -31,7 +31,7 @@ start() {
3131
srUuids=`xe sr-list type=$type params=uuid --minimal | sed "s/,/ /g"`
3232
for uuid in $srUuids; do
3333
echo -n "Fixing $type"
34-
python $LVHD_UTIL_SCRIPT fixrefcounts $uuid
34+
python $LVM_COW_UTIL_SCRIPT fixrefcounts $uuid
3535
done
3636
done
3737
echo -n $"OK"

drivers/CephFSSR.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import cleanup
4040
import lock
4141
import util
42-
import vhdutil
4342
import xs_errors
4443

4544
CAPABILITIES = ["SR_PROBE", "SR_UPDATE",

drivers/EXTSR.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import lock
3232
import os
3333
import xs_errors
34-
import vhdutil
3534
from constants import EXT_PREFIX
3635

3736
CAPABILITIES = ["SR_PROBE", "SR_UPDATE", "SR_SUPPORTS_LOCAL_CACHING",

0 commit comments

Comments
 (0)