Skip to content

Commit bc17210

Browse files
authored
fix mismatches after resolving merged conflicts (#1144)
1 parent e7356ce commit bc17210

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

modules/ROOT/pages/clustering/databases.adoc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,13 @@ For example, if the cluster's servers are set up with mode constraints to contai
2727
If `TOPOLOGY` is not specified, the database is created according to `initial.dbms.default_primaries_count` and `initial.dbms.default_secondaries_count` specified in _neo4j.conf_.
2828
After cluster startup, these values can be overwritten using the `dbms.setDefaultAllocationNumbers` procedure.
2929
====
30-
3130
[NOTE]
3231
====
3332
A `CREATE DATABASE` command allocates the database, therefore there is no requirement to execute `REALLOCATE DATABASES` (described in xref:clustering/servers.adoc#_hosting_databases_on_added_servers[Hosting databases on added servers]).
3433
However, over time, or after several `CREATE DATABASE` commands have been issued, the distribution of databases can become unbalanced.
3534
At this point you can run `REALLOCATE DATABASES` to make the cluster re-balance databases across all servers that are part of the cluster.
3635
====
3736

38-
3937
[[alter-topology]]
4038
== `ALTER DATABASE`
4139

@@ -52,11 +50,12 @@ ALTER DATABASE foo SET TOPOLOGY 2 PRIMARIES 1 SECONDARY
5250

5351
Like the `CREATE DATABASE` command, this command results in an error if the cluster does not contain sufficient servers to satisfy the requested topology.
5452

55-
When there is more than one possible permutation of the specified topology, Neo4j uses an allocator to decide how to spread the database across the cluster.
56-
Note, like `CREATE DATABASE`, the `ALTER DATABASE` command allocates the database and there is no requirement to execute `REALLOCATE DATABASES` unless there is a desire to re-balance databases across all servers that are part of the cluster.
53+
Additionally, `ALTER DATABASE` is optionally idempotent and also results in an error if the database does not exist.
54+
It is possible to append the command with `IF EXISTS` to make sure that no error is returned if the database does not exist.
5755

5856
When there is more than one possible permutation of the specified topology, Neo4j uses an allocator to decide how to spread the database across the cluster.
5957
Note, like `CREATE DATABASE`, the `ALTER DATABASE` command allocates the database and there is no requirement to execute `REALLOCATE DATABASES` unless there is a desire to re-balance databases across all servers that are part of the cluster.
58+
6059
This normally happens when the cluster is configured with more servers than the sum of the number of primaries and secondaries for any one database.
6160

6261
It is not possible to automatically transition to a topology with a single primary host. Attempting to do so results in an error.
@@ -73,6 +72,8 @@ Keep in mind that during such a transition, the database will be unavailable for
7372
`ALTER DATABASE` commands are optionally idempotent, with the default behavior to fail with an error if the database does not exist.
7473
Appending `IF EXISTS` to the command ensures that no error is returned and nothing happens should the database not exist.
7574

75+
If the `ALTER DATABASE` command decreases the number of allocations of a database, allocations on xref:clustering/servers.adoc#_cordoned_servers[cordoned servers] are removed first.
76+
7677
.Query
7778
[source, cypher]
7879
----
@@ -278,7 +279,7 @@ For this to work, Neo4j on each server in the cluster must be configured with id
278279
This is identical to the configuration required by remote aliases, see xref:database-administration/aliases/remote-database-alias-configuration.adoc#remote-alias-config-DBMS_admin-A[Configuration of DBMS with remote database alias].
279280
If this configuration is not performed, the `seedCredential` option fails.
280281

281-
For example, in the case of `S3SeedProvider`(the default provider): `seedCredentials: [accessKey];[secretKey]` where `accessKey` and `secretKey` are provided by AWS.
282+
For example, in the case of `S3SeedProvider`(the default provider), `seedCredentials: [accessKey];[secretKey]` where `accessKey` and `secretKey` are provided by AWS.
282283

283284
==== Seed provider reference
284285

0 commit comments

Comments
 (0)