From 25b0c19d506fcd0f5492c5d92e1b4e7718861013 Mon Sep 17 00:00:00 2001 From: Jack Waudby Date: Tue, 21 Feb 2023 16:19:09 +0000 Subject: [PATCH 1/5] add note on initial server tags and how to change them using alter server --- modules/ROOT/pages/access-control/manage-servers.adoc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/ROOT/pages/access-control/manage-servers.adoc b/modules/ROOT/pages/access-control/manage-servers.adoc index 799d7f9e7..e8432f29a 100644 --- a/modules/ROOT/pages/access-control/manage-servers.adoc +++ b/modules/ROOT/pages/access-control/manage-servers.adoc @@ -311,6 +311,11 @@ Composite databases are ignored by both `allowedDatabases` and `deniedDatabases` The composite databases are available everywhere and hold no data on their own. ==== +[NOTE] +==== +When a server is enabled the default server tags are determined by the setting `initial.server.tags`. +==== + [[server-management-alter-server]] == Modifying servers @@ -339,6 +344,10 @@ This may not be specified in combination with `deniedDatabases`. | list of database names | Only databases **not** matching the specified names may be hosted on the server. This may not be specified in combination with `allowedDatabases`. + +| tags +| list of server tags +| List of server tags used during database allocation and for load balacing and routing policies. |=== [NOTE] From 34aab25dc2852ebf067a36c2cac8297519ef5e63 Mon Sep 17 00:00:00 2001 From: Jack Waudby Date: Tue, 21 Feb 2023 16:26:29 +0000 Subject: [PATCH 2/5] add comment on SET OPTIONS override behaviour --- modules/ROOT/pages/access-control/manage-servers.adoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/ROOT/pages/access-control/manage-servers.adoc b/modules/ROOT/pages/access-control/manage-servers.adoc index e8432f29a..a22b38f20 100644 --- a/modules/ROOT/pages/access-control/manage-servers.adoc +++ b/modules/ROOT/pages/access-control/manage-servers.adoc @@ -356,6 +356,12 @@ Composite databases are ignored by both `allowedDatabases` and `deniedDatabases` The composite databases are available everywhere and hold no data on their own. ==== +[NOTE] +==== +Input provided to `SET OPTIONS {...}` replaces **all** existing options, rather than being combined with them. +For instance if `SET OPTIONS {modeConstraint:'SECONDARY'}` is executed followed by `SET OPTIONS {allowedDatabases:['foo']}`, the execution of the second `ALTER` removes the mode constraint. +==== + [[server-management-rename-server]] == Renaming servers From 0e05d7a07e7fb50b5867180bc1faef64721a81ae Mon Sep 17 00:00:00 2001 From: Jack Waudby Date: Thu, 23 Feb 2023 14:23:33 +0000 Subject: [PATCH 3/5] update enable server with tags --- modules/ROOT/pages/access-control/manage-servers.adoc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/ROOT/pages/access-control/manage-servers.adoc b/modules/ROOT/pages/access-control/manage-servers.adoc index a22b38f20..2989d0636 100644 --- a/modules/ROOT/pages/access-control/manage-servers.adoc +++ b/modules/ROOT/pages/access-control/manage-servers.adoc @@ -303,6 +303,10 @@ This may not be specified in combination with `deniedDatabases`. | list of database names | Only databases **not** matching the specified names may be hosted on the server. This may not be specified in combination with `allowedDatabases`. + +| tags +| list of server tags +| List of server tags used during database allocation and for load balancing and routing policies. |=== [NOTE] @@ -313,7 +317,7 @@ The composite databases are available everywhere and hold no data on their own. [NOTE] ==== -When a server is enabled the default server tags are determined by the setting `initial.server.tags`. +When a server is enabled if `tags` are not provided in `OPTIONS` the default server tags are taken from the setting `initial.server.tags`. ==== [[server-management-alter-server]] @@ -347,7 +351,7 @@ This may not be specified in combination with `allowedDatabases`. | tags | list of server tags -| List of server tags used during database allocation and for load balacing and routing policies. +| List of server tags used during database allocation and for load balancing and routing policies. |=== [NOTE] From 2063007e31c0cdef2502a3ae21f01f4e8f51057c Mon Sep 17 00:00:00 2001 From: Jack Waudby <33488812+jackwaudby@users.noreply.github.com> Date: Fri, 24 Feb 2023 09:10:55 +0000 Subject: [PATCH 4/5] Update modules/ROOT/pages/access-control/manage-servers.adoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jens Pryce-Åklundh <112686610+JPryce-Aklundh@users.noreply.github.com> --- modules/ROOT/pages/access-control/manage-servers.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ROOT/pages/access-control/manage-servers.adoc b/modules/ROOT/pages/access-control/manage-servers.adoc index 2989d0636..b0d936c78 100644 --- a/modules/ROOT/pages/access-control/manage-servers.adoc +++ b/modules/ROOT/pages/access-control/manage-servers.adoc @@ -363,7 +363,7 @@ The composite databases are available everywhere and hold no data on their own. [NOTE] ==== Input provided to `SET OPTIONS {...}` replaces **all** existing options, rather than being combined with them. -For instance if `SET OPTIONS {modeConstraint:'SECONDARY'}` is executed followed by `SET OPTIONS {allowedDatabases:['foo']}`, the execution of the second `ALTER` removes the mode constraint. +For instance, if `SET OPTIONS {modeConstraint:'SECONDARY'}` is run followed by `SET OPTIONS {allowedDatabases:['foo']}`, the second `ALTER` removes the mode constraint. ==== [[server-management-rename-server]] From 4e10138a51984dd4a88463ce453d02fab4782787 Mon Sep 17 00:00:00 2001 From: Jack Waudby <33488812+jackwaudby@users.noreply.github.com> Date: Fri, 24 Feb 2023 09:11:07 +0000 Subject: [PATCH 5/5] Update modules/ROOT/pages/access-control/manage-servers.adoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jens Pryce-Åklundh <112686610+JPryce-Aklundh@users.noreply.github.com> --- modules/ROOT/pages/access-control/manage-servers.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ROOT/pages/access-control/manage-servers.adoc b/modules/ROOT/pages/access-control/manage-servers.adoc index b0d936c78..2760fbf46 100644 --- a/modules/ROOT/pages/access-control/manage-servers.adoc +++ b/modules/ROOT/pages/access-control/manage-servers.adoc @@ -317,7 +317,7 @@ The composite databases are available everywhere and hold no data on their own. [NOTE] ==== -When a server is enabled if `tags` are not provided in `OPTIONS` the default server tags are taken from the setting `initial.server.tags`. +When a server is enabled, if `tags` are not provided in `OPTIONS`, the default server tags are taken from the setting `initial.server.tags`. ==== [[server-management-alter-server]]