Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZODB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
ZODB
Commits
ce8372cf
Commit
ce8372cf
authored
Aug 04, 2008
by
Christian Theune
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug 251037: make packing of blob storages non-blocking.
parent
06d93892
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
9 deletions
+56
-9
src/CHANGES.txt
src/CHANGES.txt
+2
-0
src/ZODB/blob.py
src/ZODB/blob.py
+23
-9
src/ZODB/tests/blob_packing.txt
src/ZODB/tests/blob_packing.txt
+31
-0
No files found.
src/CHANGES.txt
View file @
ce8372cf
...
@@ -37,6 +37,8 @@ New Features
...
@@ -37,6 +37,8 @@ New Features
Bugs Fixed
Bugs Fixed
----------
----------
- Fix for bug #251037: Make packing of blob storages non-blocking.
- Fix for bug #220856: Completed implementation of ZEO authentication.
- Fix for bug #220856: Completed implementation of ZEO authentication.
- Fix for bug #184057: Make initialisation of small ZEO client file cache
- Fix for bug #184057: Make initialisation of small ZEO client file cache
...
...
src/ZODB/blob.py
View file @
ce8372cf
...
@@ -392,6 +392,10 @@ class FilesystemHelper:
...
@@ -392,6 +392,10 @@ class FilesystemHelper:
yield
oid
,
self
.
getPathForOID
(
oid
)
yield
oid
,
self
.
getPathForOID
(
oid
)
class
BlobStorageError
(
Exception
):
"""The blob storage encountered an invalid state."""
class
BlobStorage
(
SpecificationDecoratorBase
):
class
BlobStorage
(
SpecificationDecoratorBase
):
"""A storage to support blobs."""
"""A storage to support blobs."""
...
@@ -399,7 +403,8 @@ class BlobStorage(SpecificationDecoratorBase):
...
@@ -399,7 +403,8 @@ class BlobStorage(SpecificationDecoratorBase):
# Proxies can't have a __dict__ so specifying __slots__ here allows
# Proxies can't have a __dict__ so specifying __slots__ here allows
# us to have instance attributes explicitly on the proxy.
# us to have instance attributes explicitly on the proxy.
__slots__
=
(
'fshelper'
,
'dirty_oids'
,
'_BlobStorage__supportsUndo'
)
__slots__
=
(
'fshelper'
,
'dirty_oids'
,
'_BlobStorage__supportsUndo'
,
'_blobs_pack_is_in_progress'
,
)
def
__new__
(
self
,
base_directory
,
storage
):
def
__new__
(
self
,
base_directory
,
storage
):
return
SpecificationDecoratorBase
.
__new__
(
self
,
storage
)
return
SpecificationDecoratorBase
.
__new__
(
self
,
storage
)
...
@@ -418,6 +423,7 @@ class BlobStorage(SpecificationDecoratorBase):
...
@@ -418,6 +423,7 @@ class BlobStorage(SpecificationDecoratorBase):
else
:
else
:
supportsUndo
=
supportsUndo
()
supportsUndo
=
supportsUndo
()
self
.
__supportsUndo
=
supportsUndo
self
.
__supportsUndo
=
supportsUndo
self
.
_blobs_pack_is_in_progress
=
False
@
non_overridable
@
non_overridable
def
temporaryDirectory
(
self
):
def
temporaryDirectory
(
self
):
...
@@ -528,21 +534,29 @@ class BlobStorage(SpecificationDecoratorBase):
...
@@ -528,21 +534,29 @@ class BlobStorage(SpecificationDecoratorBase):
@
non_overridable
@
non_overridable
def
pack
(
self
,
packtime
,
referencesf
):
def
pack
(
self
,
packtime
,
referencesf
):
"""Remove all unused oid/tid combinations."""
"""Remove all unused OID/TID combinations."""
unproxied
=
getProxiedObject
(
self
)
# pack the underlying storage, which will allow us to determine
# which serials are current.
result
=
unproxied
.
pack
(
packtime
,
referencesf
)
# perform a pack on blob data
self
.
_lock_acquire
()
self
.
_lock_acquire
()
try
:
try
:
if
self
.
_blobs_pack_is_in_progress
:
raise
BlobStorageError
(
'Already packing'
)
self
.
_blobs_pack_is_in_progress
=
True
finally
:
self
.
_lock_release
()
try
:
# Pack the underlying storage, which will allow us to determine
# which serials are current.
unproxied
=
getProxiedObject
(
self
)
result
=
unproxied
.
pack
(
packtime
,
referencesf
)
# Perform a pack on the blob data.
if
self
.
__supportsUndo
:
if
self
.
__supportsUndo
:
self
.
_packUndoing
(
packtime
,
referencesf
)
self
.
_packUndoing
(
packtime
,
referencesf
)
else
:
else
:
self
.
_packNonUndoing
(
packtime
,
referencesf
)
self
.
_packNonUndoing
(
packtime
,
referencesf
)
finally
:
finally
:
self
.
_lock_acquire
()
self
.
_blobs_pack_is_in_progress
=
False
self
.
_lock_release
()
self
.
_lock_release
()
return
result
return
result
...
...
src/ZODB/tests/blob_packing.txt
View file @
ce8372cf
...
@@ -240,6 +240,37 @@ revision as well as the entire directory:
...
@@ -240,6 +240,37 @@ revision as well as the entire directory:
>>> os.path.exists(os.path.split(fns[0])[0])
>>> os.path.exists(os.path.split(fns[0])[0])
False
False
Avoiding parallel packs
=======================
Blob packing (similar to FileStorage) can only be run once at a time. For
this, a flag (_blobs_pack_is_in_progress) is set. If the pack method is called
while this flag is set, it will refuse to perform another pack, until the flag
is reset:
>>> blob_storage._blobs_pack_is_in_progress
False
>>> blob_storage._blobs_pack_is_in_progress = True
>>> blob_storage.pack(packtime, referencesf)
Traceback (most recent call last):
BlobStorageError: Already packing
>>> blob_storage._blobs_pack_is_in_progress = False
>>> blob_storage.pack(packtime, referencesf)
We can also see, that the flag is set during the pack, by leveraging the
knowledge that the underlying storage's pack method is also called:
>>> def dummy_pack(time, ref):
... print "_blobs_pack_is_in_progress =", blob_storage._blobs_pack_is_in_progress
... return base_pack(time, ref)
>>> base_pack = base_storage.pack
>>> base_storage.pack = dummy_pack
>>> blob_storage.pack(packtime, referencesf)
_blobs_pack_is_in_progress = True
>>> blob_storage._blobs_pack_is_in_progress
False
>>> base_storage.pack = base_pack
Clean up our blob directory:
Clean up our blob directory:
>>> shutil.rmtree(blob_dir)
>>> shutil.rmtree(blob_dir)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment