apache / apache/iceberg-python
FsspecFileIO: `_adls` mutates shared properties, so a second storage account gets the first account's filesystem
- 主要語言
- Python
- 星號
- 1.1k
- 分支
- 581
- 平均合併
- 1 天 13 小時
- 30 天內合併 PR
- 76
描述
### Apache Iceberg version
main (development)
### Please describe the bug 🐞
`_adls` writes the account name it infers back into the properties dict it is handed, and the call site passes the FileIO's own `self.properties`. So the first ADLS location a `FsspecFileIO` touches pins `adls.account-name` for the life of that FileIO, and every later location is served a filesystem built for the first account.
In `pyiceberg/io/fsspec.py`:
```python
def _adls(properties: Properties, hostname: str | None = None) -> AbstractFileSystem:
...
# Fallback: extract account_name from URI hostname
if hostname and ADLS_ACCOUNT_NAME not in properties:
properties[ADLS_ACCOUNT_NAME] = hostname.split(".")[0]
```
and the caller at `fsspec.py:515`:
```python
if scheme in _ADLS_SCHEMES:
return _adls(self.properties, hostname)
```
The `lru_cache` on `(scheme, hostname)` just above it is not the problem. It does correctly build a second filesystem for a second hostname. But by then `ADLS_ACCOUNT_NAME` is already present in the shared properties, so the inference is skipped and the second filesystem gets the first account.
### Steps to reproduce
Two locations in two different storage accounts, starting from empty properties:
```python
from unittest.mock import patch
from pyiceberg.io.fsspec import FsspecFileIO
loc_a = "abfss://data@accountone.dfs.core.windows.net/wh/t/a.parquet"
loc_b = "abfss://data@accounttwo.dfs.core.windows.net/wh/t/b.parquet"
captured = []
class FakeFS:
def __init__(self, **kw): captured.append(kw.get("account_name"))
io = FsspecFileIO(properties={})
with patch("adlfs.AzureBlobFileSystem", FakeFS):
io.new_input(loc_a)
print(dict(io.properties))
io.new_input(loc_b)
print(dict(io.properties))
print(captured)
```
Output:
```
{'adls.account-name': 'accountone'}
{'adls.account-name': 'accountone'}
['accountone', 'accountone']
```
Expected `['accountone', 'accounttwo']`.
### What I expected
A FileIO given no `adls.account-name` should infer the account per location, not once. The inference is already per hostname at the cache layer, only the write into the shared dict breaks it.
The same mutation happens a few lines above in the SAS token loop, which sets `ADLS_ACCOUNT_NAME` from the token key, so that path has the same effect.
### Impact
A catalog whose tables span two storage accounts silently reads from the wrong account. Depending on whether a same named container exists there, this either fails with a confusing not found or resolves to the wrong data. It also means a FileIO's properties change as a side effect of reading, which is surprising for anything that inspects or reuses them.
### Suggested fix
Do not write into `properties`. Resolve the account into a local value inside `_adls` and pass that to `AzureBlobFileSystem`, leaving the caller's dict untouched. Happy to send a PR.
### Willingness to contribute
- [x] I can contribute a fix for this bug independently
- [ ] I would be willing to contribute a fix for this bug with guidance from the Iceberg community
- [ ] I cannot contribute a fix for this bug at this time
貢獻指南
這個儲存庫沒有索引到貢獻指南
研究方向
從 pyiceberg/io/fsspec.py 中的 _adls 及其約第 515 行的呼叫方開始,然後使用模擬的 AzureBlobFileSystem 執行兩個位置的重現。驗證每個 hostname 都會產生自己的帳戶,且在兩次讀取後 io.properties 保持不變。
由索引模型根據 Issue 內容生成。
評估
- 技術堆疊
- python
- 領域
- backend, cloud
- Issue 類型
- 缺陷
- 難度
- 2/5
- 預估耗時
- 1-3 小時
- 活躍度
- 活躍
- 描述清晰度
- 描述清楚
- 新手友好度
- 78/100