Skip to content

Commit cfc980a

Browse files
committed
sync array init metadata load
1 parent 68e6645 commit cfc980a

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

zarr/core.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,12 @@ def __init__(self, store, path=None, read_only=False, chunk_store=None,
9797
self._is_view = False
9898

9999
# initialize metadata
100-
self._load_metadata()
100+
if self._synchronizer is None:
101+
self._load_metadata()
102+
else:
103+
mkey = self._key_prefix + array_meta_key
104+
with self._synchronizer[mkey]:
105+
self._load_metadata()
101106

102107
# initialize attributes
103108
akey = self._key_prefix + attrs_key

zarr/tests/test_sync.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def test_parallel_setitem(self):
7878

7979
# parallel setitem
8080
future = pool.map_async(_set_arange, zip([arr] * n, range(n)))
81-
results = future.get(30)
81+
results = future.get(60)
8282
print(results)
8383
eq(list(range(n)), sorted(results))
8484
assert_array_equal(np.arange(n * 1000), arr[:])
@@ -93,7 +93,7 @@ def test_parallel_append(self):
9393

9494
# parallel append
9595
future = pool.map_async(_append, zip([arr] * n, range(n)))
96-
results = future.get(30)
96+
results = future.get(60)
9797
print(results)
9898
eq([((i+2)*1000,) for i in range(n)], sorted(results))
9999
eq(((n+1)*1000,), arr.shape)
@@ -183,7 +183,7 @@ def test_parallel_create_group(self):
183183
n = 100
184184
results = pool.map_async(
185185
_create_group, zip([g] * n, [str(i) for i in range(n)]))
186-
print(results.get(30))
186+
print(results.get(60))
187187

188188
eq(n, len(g))
189189

@@ -197,7 +197,7 @@ def test_parallel_require_group(self):
197197
n = 100
198198
results = pool.map_async(
199199
_require_group, zip([g] * n, [str(i//10) for i in range(n)]))
200-
print(results.get(30))
200+
print(results.get(60))
201201

202202
eq(n//10, len(g))
203203

0 commit comments

Comments
 (0)