git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/cassandra: Don't force SimpleSeedProvider

If the `seedAddresses` is not set, don't force `SimpleSeedProvider` to be in `seed_provider`. This could cause problems in a multi-datacenter deployment when a different seed provider is preferred.

commit03503121da3305b03b17d9f4fbfe99258cfd195f authorDaniel Schaefer <git@danielschaefer.me> dateThu 2 May 2019, 08:59 (8 years ago) parent8e5ba87
1 file changed+8−7
nixos/modules/services/databases/cassandra.nix+8−7
nixos/modules/services/databases/cassandra.nix+8−7
@@ -12,16 +12,17 @@ let
1212 cluster_name = cfg.clusterName;
1313 partitioner = "org.apache.cassandra.dht.Murmur3Partitioner";
1414 endpoint_snitch = "SimpleSnitch";
15− seed_provider =
16− [{ class_name = "org.apache.cassandra.locator.SimpleSeedProvider";
17− parameters = [ { seeds = concatStringsSep "," cfg.seedAddresses; } ];
18− }];
1915 data_file_directories = [ "${cfg.homeDir}/data" ];
2016 commitlog_directory = "${cfg.homeDir}/commitlog";
2117 saved_caches_directory = "${cfg.homeDir}/saved_caches";
22− } // (if lib.versionAtLeast cfg.package.version "3"
23− then { hints_directory = "${cfg.homeDir}/hints"; }
24− else {})
18+ } // (lib.optionalAttrs (cfg.seedAddresses != []) {
19+ seed_provider = [{
20+ class_name = "org.apache.cassandra.locator.SimpleSeedProvider";
21+ parameters = [ { seeds = concatStringsSep "," cfg.seedAddresses; } ];
22+ }];
23+ }) // (lib.optionalAttrs (lib.versionAtLeast cfg.package.version "3") {
24+ hints_directory = "${cfg.homeDir}/hints";
25+ })
2526 );
2627 cassandraConfigWithAddresses = cassandraConfig //
2728 ( if cfg.listenAddress == null