mirror of
https://github.com/hanzoai/datastore.git
synced 2026-09-26 13:55:07 +00:00
zeekay
9a90943b8f
13,838 upstream commits, forward from the 26.6.1.1 fork point. 129 conflicts: 37 resolved mechanically (take upstream's file, re-apply the brand sweep) and 92 by hand where our fork and upstream had both changed the same code. The rule throughout: upstream owns the engine, we own the naming and a small set of deliberate deviations. Never resolve by discarding an upstream change — a dropped rename or a missed new parameter becomes a compile error a thousand files away. Deviations verified intact after the merge: ENABLE_XRAY still defaults OFF (CMakeLists.txt:105) X-Datastore-User read by the server (authenticateUserByHTTP.cpp) X-ClickHouse-* in src/ 0 hanzo/research present system.*_log retention bound present ArrowFlight rip held against upstream re-adding it Two things worth naming, because neither shows up as a conflict: src/CMakeLists.txt gained an UNGUARDED `add_object_library(datastore_storages_arrowflight Storages/ArrowFlight)` from upstream, for a directory our gRPC rip deleted. It sat outside every conflict hunk, so a resolver reading only the markers would sail straight past it into a CMake configure error. Removed; the Server/ArrowFlight sibling at line 474 stays because it is inside `if (TARGET ch_contrib::arrow_flight)`. The brand sweep had rewritten github.com/ClickHouse/ClickHouse issue links to github.com/Datastore/Datastore — a dead host. Those point at upstream's own tracker and are restored, alongside the contributors list, sql.clickhouse.com and the ClickHouse Inc copyright: attribution is theirs, not ours to rename. base/glibc-compatibility/memcpy/memcpy.h is deleted, not kept: upstream dropped it for LLVM-libc's, and our only change to it was a comment rebrand.
62 lines
2.3 KiB
XML
62 lines
2.3 KiB
XML
<datastore>
|
|
<listen_host>::</listen_host>
|
|
|
|
<logger>
|
|
<level>trace</level>
|
|
<log>/var/log/clickhouse-keeper/clickhouse-keeper.log</log>
|
|
<errorlog>/var/log/clickhouse-keeper/clickhouse-keeper.err.log</errorlog>
|
|
<size>never</size>
|
|
</logger>
|
|
|
|
<!-- The standalone Keeper is launched (keeper/utils.clj) with
|
|
keeper_server storage-disk flags (snapshot_local, latest_snapshot_local,
|
|
log_local, latest_log_local), so those disks must be defined here (as in
|
|
keeper_config.xml) or Keeper aborts at startup with UNKNOWN_DISK. -->
|
|
<storage_configuration>
|
|
<disks>
|
|
<log_local>
|
|
<type>local</type>
|
|
<path>/home/robot-clickhouse/db/coordination/logs/</path>
|
|
</log_local>
|
|
<latest_log_local>
|
|
<type>local</type>
|
|
<path>/home/robot-clickhouse/db/coordination/latest_log/</path>
|
|
</latest_log_local>
|
|
<snapshot_local>
|
|
<type>local</type>
|
|
<path>/home/robot-clickhouse/db/coordination/snapshots/</path>
|
|
</snapshot_local>
|
|
<latest_snapshot_local>
|
|
<type>local</type>
|
|
<path>/home/robot-clickhouse/db/coordination/latest_snapshot/</path>
|
|
</latest_snapshot_local>
|
|
</disks>
|
|
</storage_configuration>
|
|
|
|
<keeper_server>
|
|
<tcp_port>9181</tcp_port>
|
|
<server_id>1</server_id>
|
|
<digest_enabled>1</digest_enabled>
|
|
|
|
<coordination_settings>
|
|
<operation_timeout_ms>10000</operation_timeout_ms>
|
|
<session_timeout_ms>30000</session_timeout_ms>
|
|
<force_sync>false</force_sync>
|
|
<startup_timeout>120000</startup_timeout>
|
|
<raft_logs_level>trace</raft_logs_level>
|
|
<heart_beat_interval_ms>1000</heart_beat_interval_ms>
|
|
<election_timeout_lower_bound_ms>2000</election_timeout_lower_bound_ms>
|
|
<election_timeout_upper_bound_ms>4000</election_timeout_upper_bound_ms>
|
|
<async_replication>1</async_replication>
|
|
</coordination_settings>
|
|
|
|
<raft_configuration>
|
|
<server>
|
|
<id>1</id>
|
|
<hostname>{srv1}</hostname>
|
|
<port>9444</port>
|
|
</server>
|
|
</raft_configuration>
|
|
</keeper_server>
|
|
</datastore>
|