Change in vdsm[master]: oop: rename createSparseFile to truncateFile
fsimonce at redhat.com
fsimonce at redhat.com
Wed May 8 15:38:58 UTC 2013
Federico Simoncelli has uploaded a new change for review.
Change subject: oop: rename createSparseFile to truncateFile
......................................................................
oop: rename createSparseFile to truncateFile
Change-Id: I832313645aaa33c8d269f8154bd6b0f7ca3946ea
Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>
---
M vdsm/storage/fileSD.py
M vdsm/storage/fileVolume.py
M vdsm/storage/remoteFileHandler.py
3 files changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/14588/1
diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py
index d65b2b5..c79938f 100644
--- a/vdsm/storage/fileSD.py
+++ b/vdsm/storage/fileSD.py
@@ -202,7 +202,7 @@
for metaFile in (sd.LEASES, sd.IDS, sd.INBOX, sd.OUTBOX):
try:
- procPool.createSparseFile(
+ procPool.truncateFile(
os.path.join(metadataDir, metaFile), 0, 0660)
except Exception as e:
raise se.StorageDomainMetadataCreationError(
diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py
index 4b61829..e463502 100644
--- a/vdsm/storage/fileVolume.py
+++ b/vdsm/storage/fileVolume.py
@@ -135,7 +135,7 @@
if preallocate == volume.SPARSE_VOL:
# Sparse = regular file
- oop.getProcessPool(dom.sdUUID).createSparseFile(volPath, sizeBytes)
+ oop.getProcessPool(dom.sdUUID).truncateFile(volPath, sizeBytes)
else:
try:
# ddWatchCopy expects size to be in bytes
@@ -384,8 +384,7 @@
"metaId=%s", volUUID, sdUUID, metaId)
volPath, = metaId
leasePath = cls.__leaseVolumePath(volPath)
- oop.getProcessPool(sdUUID).createSparseFile(leasePath,
- LEASE_FILEOFFSET)
+ oop.getProcessPool(sdUUID).truncateFile(leasePath, LEASE_FILEOFFSET)
cls.file_setrw(leasePath, rw=True)
sanlock.init_resource(sdUUID, volUUID, [(leasePath,
LEASE_FILEOFFSET)])
diff --git a/vdsm/storage/remoteFileHandler.py b/vdsm/storage/remoteFileHandler.py
index ad0f4a6..ef2db2d 100644
--- a/vdsm/storage/remoteFileHandler.py
+++ b/vdsm/storage/remoteFileHandler.py
@@ -334,7 +334,7 @@
return f.writelines(lines)
-def createSparseFile(path, size, mode=None):
+def truncateFile(path, size, mode=None):
with open(path, "w") as f:
if mode is not None:
os.chmod(path, mode)
@@ -398,7 +398,7 @@
try:
server = CrabRPCServer(myRead, myWrite)
- for func in (writeLines, readLines, createSparseFile, echo, sleep,
+ for func in (writeLines, readLines, truncateFile, echo, sleep,
directWriteLines, directReadLines, simpleWalk,
directTouch):
--
To view, visit http://gerrit.ovirt.org/14588
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I832313645aaa33c8d269f8154bd6b0f7ca3946ea
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce at redhat.com>
More information about the vdsm-patches
mailing list