summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2020-02-19 16:59:11 +0100
committerJan Lehnardt <jan@apache.org>2020-02-19 17:10:30 +0100
commit9ed8c2e7849712bb520f4fb4c9163bd347697710 (patch)
tree7c277b188a22102c843daa76d614c2aaf0f97b67
parent09ac7208e6078bbbf56c569a62cddabc973932db (diff)
downloadcouchdb-fix/2557-master/single-node-state.tar.gz
fix: single node statefix/2557-master/single-node-state
-rw-r--r--src/setup/src/setup.erl12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/setup/src/setup.erl b/src/setup/src/setup.erl
index 3d23229b8..cc64ae438 100644
--- a/src/setup/src/setup.erl
+++ b/src/setup/src/setup.erl
@@ -65,13 +65,15 @@ is_cluster_enabled() ->
end.
is_single_node_enabled(Dbs) ->
- % admins != empty AND dbs exist
+ % admins != empty AND dbs exist OR `[couchdb] single_node` is set to true
Admins = config:get("admins"),
HasDbs = has_cluster_system_dbs(Dbs),
- case {Admins, HasDbs} of
- {[], _} -> false;
- {_, false} -> false;
- {_,_} -> true
+ SingleNodeConfig = config:get_boolean("couchdb", "single_node", false),
+ case {Admins, HasDbs, SingleNodeConfig} of
+ {_, _, true} -> true;
+ {[], _, _} -> false;
+ {_, false, _} -> false;
+ {_,_,_} -> true
end.
cluster_system_dbs() ->