Skip to content

Stable 26.8 Backport of #124721 - Do not check Azure disks from the server config against remote_url_allow_hosts - #2906

Draft
blau-ai wants to merge 3 commits into
stable-26.8from
backports/stable-26.8/124721
Draft

blau-ai wants to merge 3 commits into
stable-26.8from
backports/stable-26.8/124721

Conversation

@blau-ai

@blau-ai blau-ai commented Nov 18, 2026

Copy link
Copy Markdown
Collaborator

Changelog category (leave one):

  • Bug Fix (user-visible misbehavior in an official stable release)

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

Fix server startup failure when an Azure Blob Storage disk from the server configuration has an endpoint that is not listed in remote_url_allow_hosts (since 26.7). Such disks are no longer checked against this list, like S3 disks, also when a data lake table uses one via SETTINGS disk = .... Disks created by disk(...) in a query, URLs of table functions and table engines, and redirects are still checked. An existing table on a disk(...) disk whose host is no longer allowed loads with a warning and keeps reading and writing to that host, as for S3 disks; a new disk(...) with that host is rejected. Closes ClickHouse#124431. (ClickHouse#124721 by @groeneai)

Documentation entry for user-facing changes

...

CI/CD Options

Exclude tests:

  • Fast test
  • Integration Tests
  • Stateless tests
  • Stateful tests
  • Unit tests
  • Performance tests
  • Aarch64 tests
  • All with ASAN
  • All with TSAN
  • All with MSAN
  • All with UBSAN
  • All with Coverage
  • All Regression
  • Disable CI Cache

Regression jobs to run:

  • Fast suites (mostly <1h)
  • Aggregate Functions (2h)
  • Alter (1.5h)
  • Benchmark (30m)
  • CAS (content-addressed storage; Antalya only)
  • ClickHouse Keeper (1h)
  • Iceberg (2h)
  • LDAP (1h)
  • OAuth (5m)
  • Parquet (1.5h)
  • RBAC (1.5h)
  • SSL Server (1h)
  • S3 (2h)
  • S3 Export (2h)
  • Swarms (30m)
  • Tiered Storage (2h)

PedroTadim and others added 2 commits November 18, 2026 16:10
…url-allow-hosts

Do not check Azure disks from the server config against remote_url_allow_hosts

Conflicts committed as-is; the next commit resolves them:
- src/Disks/DiskObjectStorage/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp (both modified)
- src/Disks/DiskObjectStorage/ObjectStorages/ObjectStorageFactory.cpp (both modified)
- tests/integration/test_allowed_url_from_config/test.py (both modified)
- tests/integration/test_merge_tree_azure_blob_storage/test.py (both modified)
Kept the PR's Azure disk host-check, warning and test changes; dropped the unrelated master-only credential-restriction code and tests.
@blau-ai

blau-ai commented Nov 18, 2026

Copy link
Copy Markdown
Collaborator Author

Port-AL: cherry-pick conflicts resolved by AI

Conflicted files:

  • src/Disks/DiskObjectStorage/ObjectStorages/AzureBlobStorage/AzureBlobStorageCommon.cpp (both modified)
  • src/Disks/DiskObjectStorage/ObjectStorages/ObjectStorageFactory.cpp (both modified)
  • tests/integration/test_allowed_url_from_config/test.py (both modified)
  • tests/integration/test_merge_tree_azure_blob_storage/test.py (both modified)

Commits:

  • 090296c: cherry-pick with the conflicts committed as-is

  • 041abda: resolution

  • AzureBlobStorageCommon.cpp: the conflict block held only server-managed-credential restriction code and getConnectionURLWithoutQuery, which stable-26.8 doesn't have. I removed it entirely. The PR's own changes in this file applied cleanly and stay: getClientConnectionString, the getConnectionURL fix, and SetClickhouseOptions after CreateBlobContainer.

  • ObjectStorageFactory.cpp: I kept the WriteBufferFromAzureDataLakeStorage.h include and the Azure host-check block (it warns when loading existing metadata and rejects otherwise, and also checks the ADLS Gen2 write host). I dropped the getDiskConfigurationFromAST.h include and the checkOrDropServerManagedCredentials block, which come from a different master feature. The creator lambda now names its remote_host_filter_check parameter so the check can use it.

  • test_allowed_url_from_config/test.py: kept the PR's test_azure_disk_client_host. I dropped the unrelated test_object_storage_queue_move_destination_host_filter.

  • test_merge_tree_azure_blob_storage/test.py: kept the PR's test_endpoint_host_filter_on_restart. I dropped the unrelated test_reject_zero_min_upload_part_size_in_disk_config.

@github-actions

github-actions Bot commented Nov 18, 2026 •

Copy link
Copy Markdown

Workflow [PR], commit [d45b536]

@zvonand

zvonand commented Nov 20, 2026

Copy link
Copy Markdown
Member

@blau-ai resolve conflicts

# Conflicts:
#	tests/integration/test_allowed_url_from_config/test.py
@blau-ai

blau-ai commented Nov 20, 2026

Copy link
Copy Markdown
Collaborator Author

Conflicts with stable-26.8 are resolved. I merged the base branch in (no rebase, no force-push) as d45b536.

One file conflicted: tests/integration/test_allowed_url_from_config/test.py. I kept both sides.

  • This PR adds test_azure_disk_client_host, which checks that an Azure disk whose client endpoint is not allowed gets rejected on node2.
  • stable-26.8 adds test_object_storage_queue_move_destination_host_filter, the S3Queue/AzureQueue move-destination host check on node1.
  • They are separate tests that were inserted at the same spot. Both are now in the file, one after the other, with nothing else changed.

These files merged without conflicts:

  • AzureBlobStorageCommon.cpp
  • The test configs: the PR adds onelake.blob.fabric.microsoft.com to config_with_only_primary_hosts.xml, and the base adds a .*\.allowed\.example regexp to config_with_hosts.xml. Those are different files used by different nodes, so they don't clash.

Check: after the merge, git diff origin/stable-26.8 HEAD lists exactly the PR's 10 files (179+/29−) and deletes nothing. I did not build or run anything locally, since only test code needed hand resolution. CI on the PR will confirm the result.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants