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
4e2afee7
Commit
4e2afee7
authored
Apr 28, 2009
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleaned up trailing whitespace.
parent
01d8d833
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
src/ZEO/ClientStorage.py
src/ZEO/ClientStorage.py
+16
-16
No files found.
src/ZEO/ClientStorage.py
View file @
4e2afee7
...
@@ -225,7 +225,7 @@ class ClientStorage(object):
...
@@ -225,7 +225,7 @@ class ClientStorage(object):
Maximum size of the ZEO blob cache, in bytes. If not set, then
Maximum size of the ZEO blob cache, in bytes. If not set, then
the cache size isn't checked and the blob directory will
the cache size isn't checked and the blob directory will
grow without bound.
grow without bound.
This option is ignored if shared_blob_dir is true.
This option is ignored if shared_blob_dir is true.
blob_cache_size_check
blob_cache_size_check
...
@@ -241,7 +241,7 @@ class ClientStorage(object):
...
@@ -241,7 +241,7 @@ class ClientStorage(object):
"""
"""
self
.
__name__
=
name
or
str
(
addr
)
# Standard convention for storages
self
.
__name__
=
name
or
str
(
addr
)
# Standard convention for storages
logger
.
info
(
logger
.
info
(
"%s %s (pid=%d) created %s/%s for storage: %r"
,
"%s %s (pid=%d) created %s/%s for storage: %r"
,
self
.
__name__
,
self
.
__name__
,
...
@@ -315,7 +315,7 @@ class ClientStorage(object):
...
@@ -315,7 +315,7 @@ class ClientStorage(object):
self
.
_server_addr
=
None
self
.
_server_addr
=
None
self
.
_pickler
=
self
.
_tfile
=
None
self
.
_pickler
=
self
.
_tfile
=
None
self
.
_info
=
{
'length'
:
0
,
'size'
:
0
,
'name'
:
'ZEO Client'
,
self
.
_info
=
{
'length'
:
0
,
'size'
:
0
,
'name'
:
'ZEO Client'
,
'supportsUndo'
:
0
,
'interfaces'
:
()}
'supportsUndo'
:
0
,
'interfaces'
:
()}
...
@@ -369,7 +369,7 @@ class ClientStorage(object):
...
@@ -369,7 +369,7 @@ class ClientStorage(object):
# XXX need to check for POSIX-ness here
# XXX need to check for POSIX-ness here
self
.
blob_dir
=
blob_dir
self
.
blob_dir
=
blob_dir
self
.
shared_blob_dir
=
shared_blob_dir
self
.
shared_blob_dir
=
shared_blob_dir
if
blob_dir
is
not
None
:
if
blob_dir
is
not
None
:
# Avoid doing this import unless we need it, as it
# Avoid doing this import unless we need it, as it
# currently requires pywin32 on Windows.
# currently requires pywin32 on Windows.
...
@@ -415,7 +415,7 @@ class ClientStorage(object):
...
@@ -415,7 +415,7 @@ class ClientStorage(object):
if
not
self
.
_rpc_mgr
.
attempt_connect
():
if
not
self
.
_rpc_mgr
.
attempt_connect
():
self
.
_rpc_mgr
.
connect
()
self
.
_rpc_mgr
.
connect
()
def
_wait
(
self
,
timeout
=
None
):
def
_wait
(
self
,
timeout
=
None
):
if
timeout
is
not
None
:
if
timeout
is
not
None
:
...
@@ -470,11 +470,11 @@ class ClientStorage(object):
...
@@ -470,11 +470,11 @@ class ClientStorage(object):
if
(
bytes
is
not
None
)
and
(
bytes
<
self
.
_blob_cache_size_check
):
if
(
bytes
is
not
None
)
and
(
bytes
<
self
.
_blob_cache_size_check
):
return
return
self
.
_blob_data_bytes_loaded
=
0
self
.
_blob_data_bytes_loaded
=
0
target
=
max
(
self
.
_blob_cache_size
-
self
.
_blob_cache_size_check
,
0
)
target
=
max
(
self
.
_blob_cache_size
-
self
.
_blob_cache_size_check
,
0
)
check_blob_size_thread
=
threading
.
Thread
(
check_blob_size_thread
=
threading
.
Thread
(
target
=
_check_blob_cache_size
,
target
=
_check_blob_cache_size
,
args
=
(
self
.
blob_dir
,
self
.
_blob_cache_size
),
args
=
(
self
.
blob_dir
,
self
.
_blob_cache_size
),
...
@@ -623,7 +623,7 @@ class ClientStorage(object):
...
@@ -623,7 +623,7 @@ class ClientStorage(object):
# If we end up doing a full-verification, we need to wait till
# If we end up doing a full-verification, we need to wait till
# it's done. By doing a synchonous call, we are guarenteed
# it's done. By doing a synchonous call, we are guarenteed
# that the verification will be done because operations are
# that the verification will be done because operations are
# handled in order.
# handled in order.
self
.
_info
.
update
(
stub
.
get_info
())
self
.
_info
.
update
(
stub
.
get_info
())
self
.
_handle_extensions
()
self
.
_handle_extensions
()
...
@@ -992,11 +992,11 @@ class ClientStorage(object):
...
@@ -992,11 +992,11 @@ class ClientStorage(object):
# We're using a server shared cache. If the file isn't
# We're using a server shared cache. If the file isn't
# here, it's not anywhere.
# here, it's not anywhere.
raise
POSException
.
POSKeyError
(
"No blob file"
,
oid
,
serial
)
raise
POSException
.
POSKeyError
(
"No blob file"
,
oid
,
serial
)
if
os
.
path
.
exists
(
blob_filename
):
if
os
.
path
.
exists
(
blob_filename
):
return
_accessed
(
blob_filename
)
return
_accessed
(
blob_filename
)
# First, we'll create the directory for this oid, if it doesn't exist.
# First, we'll create the directory for this oid, if it doesn't exist.
self
.
fshelper
.
createPathForOID
(
oid
)
self
.
fshelper
.
createPathForOID
(
oid
)
# OK, it's not here and we (or someone) needs to get it. We
# OK, it's not here and we (or someone) needs to get it. We
...
@@ -1046,7 +1046,7 @@ class ClientStorage(object):
...
@@ -1046,7 +1046,7 @@ class ClientStorage(object):
# The file got removed while we were opening.
# The file got removed while we were opening.
# Fall through and try again with the protection of the lock.
# Fall through and try again with the protection of the lock.
pass
pass
lockfilename
=
os
.
path
.
join
(
os
.
path
.
dirname
(
blob_filename
),
'.lock'
)
lockfilename
=
os
.
path
.
join
(
os
.
path
.
dirname
(
blob_filename
),
'.lock'
)
while
1
:
while
1
:
try
:
try
:
...
@@ -1074,7 +1074,7 @@ class ClientStorage(object):
...
@@ -1074,7 +1074,7 @@ class ClientStorage(object):
return
ZODB
.
blob
.
BlobFile
(
blob_filename
,
'r'
,
blob
)
return
ZODB
.
blob
.
BlobFile
(
blob_filename
,
'r'
,
blob
)
finally
:
finally
:
lock
.
close
()
lock
.
close
()
def
temporaryDirectory
(
self
):
def
temporaryDirectory
(
self
):
return
self
.
fshelper
.
temp_dir
return
self
.
fshelper
.
temp_dir
...
@@ -1405,7 +1405,7 @@ class ClientStorage(object):
...
@@ -1405,7 +1405,7 @@ class ClientStorage(object):
if
catch_up
:
if
catch_up
:
# process catch-up invalidations
# process catch-up invalidations
self
.
_process_invalidations
(
*
catch_up
)
self
.
_process_invalidations
(
*
catch_up
)
if
self
.
_pickler
is
None
:
if
self
.
_pickler
is
None
:
return
return
# write end-of-data marker
# write end-of-data marker
...
@@ -1509,7 +1509,7 @@ class ClientStorage(object):
...
@@ -1509,7 +1509,7 @@ class ClientStorage(object):
class
TransactionIterator
(
object
):
class
TransactionIterator
(
object
):
def
__init__
(
self
,
storage
,
iid
,
*
args
):
def
__init__
(
self
,
storage
,
iid
,
*
args
):
self
.
_storage
=
storage
self
.
_storage
=
storage
self
.
_iid
=
iid
self
.
_iid
=
iid
self
.
_ended
=
False
self
.
_ended
=
False
...
@@ -1621,7 +1621,7 @@ def _check_blob_cache_size(blob_dir, target):
...
@@ -1621,7 +1621,7 @@ def _check_blob_cache_size(blob_dir, target):
logger = logging.getLogger(__name__+'
.
check_blob_cache
')
logger = logging.getLogger(__name__+'
.
check_blob_cache
')
logger.info("Checking blob cache size")
logger.info("Checking blob cache size")
layout = open(os.path.join(blob_dir, ZODB.blob.LAYOUT_MARKER)
layout = open(os.path.join(blob_dir, ZODB.blob.LAYOUT_MARKER)
).read().strip()
).read().strip()
if not layout == '
zeocache
':
if not layout == '
zeocache
':
...
@@ -1635,7 +1635,7 @@ def _check_blob_cache_size(blob_dir, target):
...
@@ -1635,7 +1635,7 @@ def _check_blob_cache_size(blob_dir, target):
# Someone is already cleaning up, so don'
t
bother
# Someone is already cleaning up, so don'
t
bother
logger
.
info
(
"Another thread is checking the blob cache size"
)
logger
.
info
(
"Another thread is checking the blob cache size"
)
return
return
try
:
try
:
size
=
0
size
=
0
blob_suffix
=
ZODB
.
blob
.
BLOB_SUFFIX
blob_suffix
=
ZODB
.
blob
.
BLOB_SUFFIX
...
...
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