Make sure fs exceptions are raised if not MissingFs exceptions (clone)

zarr/storage.py

@@ -1414,9 +1414,15 @@ def getitems(
         self, keys: Sequence[str], *, contexts: Mapping[str, Context]
     ) -> Mapping[str, Any]:
         keys_transformed = [self._normalize_key(key) for key in keys]
-        results = self.map.getitems(keys_transformed, on_error="omit")
-        # The function calling this method may not recognize the transformed keys
-        # So we send the values returned by self.map.getitems back into the original key space.
+        results = self.map.getitems(keys_transformed, on_error="return")
+        # Only recognized errors will prompt KeyErrors in the function calling this method
+        for k, v in results.copy().items():
+            if isinstance(v, self.exceptions):
+                results.pop(k)
+            elif isinstance(v, Exception):
+                raise v
+        # The function calling this method may not recognize the transformed keys, so we
+        # send the values returned by self.map.getitems back into the original key space.
         return {keys[keys_transformed.index(rk)]: rv for rk, rv in results.items()}
 
     def __getitem__(self, key):

zarr/tests/test_storage.py

@@ -1337,6 +1337,24 @@ def test_s3_complex(self):
         )
         assert (a[:] == -np.ones((8, 8, 8))).all()
 
+    def test_exceptions(self):
+        import fsspec
+
+        m = fsspec.filesystem("memory")
+        g = zarr.open_group("memory://test/out.zarr", mode="w")
+        arr = g.create_dataset("data", data=[1, 2, 3, 4], dtype="i4", compression=None, chunks=[2])
+        m.store["/test/out.zarr/data/0"] = None
+        del m.store["/test/out.zarr/data/1"]
+        assert g.store.getitems(["data/1"], contexts={}) == {}  # not found
+        with pytest.raises(Exception):
+            # None is bad data, as opposed to missing
+            g.store.getitems(["data/0", "data/1"], contexts={})
+        with pytest.raises(Exception):
+            # None is bad data, as opposed to missing
+            arr[:]
+        # clear the global memory filesystem's store for use in other tests
+        m.store.clear()
+
 
 @pytest.mark.skipif(have_fsspec is False, reason="needs fsspec")
 class TestFSStoreWithKeySeparator(StoreTests):