Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## master / unreleased

* [CHANGE] Increase the default Cassandra client replication factor to 3. #3007
* [CHANGE] Experimental blocks storage: removed the support to transfer blocks between ingesters on shutdown. When running the Cortex blocks storage, ingesters are expected to run with a persistent disk. The following metrics have been removed: #2996
* `cortex_ingester_sent_files`
* `cortex_ingester_received_files`
Expand Down
2 changes: 1 addition & 1 deletion docs/configuration/config-file-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -1861,7 +1861,7 @@ cassandra:

# Replication factor to use in Cassandra.
# CLI flag: -cassandra.replication-factor
[replication_factor: <int> | default = 1]
[replication_factor: <int> | default = 3]

# Instruct the cassandra driver to not attempt to get host info from the
# system.peers table.
Expand Down
9 changes: 5 additions & 4 deletions integration/chunks_delete_series_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,11 @@ func TestDeleteSeriesAllIndexBackends(t *testing.T) {
}

flags := mergeFlags(ChunksStorageFlags, map[string]string{
"-cassandra.addresses": cassandra.NetworkHTTPEndpoint(),
"-cassandra.keyspace": "tests", // keyspace gets created on startup if it does not exist
"-purger.enable": "true",
"-deletes.store": "bigtable",
"-cassandra.addresses": cassandra.NetworkHTTPEndpoint(),
"-cassandra.keyspace": "tests", // keyspace gets created on startup if it does not exist
"-cassandra.replication-factor": "1",
"-purger.enable": "true",
"-deletes.store": "bigtable",
})

// bigtable client needs to set an environment variable when connecting to an emulator.
Expand Down
5 changes: 3 additions & 2 deletions integration/chunks_storage_backends_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,9 @@ func TestChunksStorageAllIndexBackends(t *testing.T) {
}

storageFlags := mergeFlags(ChunksStorageFlags, map[string]string{
"-cassandra.addresses": cassandra.NetworkHTTPEndpoint(),
"-cassandra.keyspace": "tests", // keyspace gets created on startup if it does not exist
"-cassandra.addresses": cassandra.NetworkHTTPEndpoint(),
"-cassandra.keyspace": "tests", // keyspace gets created on startup if it does not exist
"-cassandra.replication-factor": "1",
})

// bigtable client needs to set an environment variable when connecting to an emulator
Expand Down
2 changes: 1 addition & 1 deletion pkg/chunk/cassandra/storage_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet) {
f.IntVar(&cfg.Port, "cassandra.port", 9042, "Port that Cassandra is running on")
f.StringVar(&cfg.Keyspace, "cassandra.keyspace", "", "Keyspace to use in Cassandra.")
f.StringVar(&cfg.Consistency, "cassandra.consistency", "QUORUM", "Consistency level for Cassandra.")
f.IntVar(&cfg.ReplicationFactor, "cassandra.replication-factor", 1, "Replication factor to use in Cassandra.")
f.IntVar(&cfg.ReplicationFactor, "cassandra.replication-factor", 3, "Replication factor to use in Cassandra.")
f.BoolVar(&cfg.DisableInitialHostLookup, "cassandra.disable-initial-host-lookup", false, "Instruct the cassandra driver to not attempt to get host info from the system.peers table.")
f.BoolVar(&cfg.SSL, "cassandra.ssl", false, "Use SSL when connecting to cassandra instances.")
f.BoolVar(&cfg.HostVerification, "cassandra.host-verification", true, "Require SSL certificate validation.")
Expand Down