Skip to content

Commit 39d4306

Browse files
NataliaIvakinaNataliaIvakina
authored
Swap tabs in the examples of v2 discovery (#1903) (#1905)
1 parent 1e9c1f6 commit 39d4306

File tree

4 files changed

+114
-114
lines changed

4 files changed

+114
-114
lines changed

‎modules/ROOT/pages/clustering/setup/analytics-cluster.adoc‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ For more details on the Neo4j discovery services, see xref:clustering/setup/disc
2323

2424
[.tabbed-example]
2525
=====
26-
[role=include-with-Discovery-service-v1 label--deprecated-5.23]
26+
[role=include-with-Discovery-service-v2 label--new-5.23]
2727
======
2828

2929
In this example, three servers named `server01.example.com`, `server02.example.com` and `server03.example.com` are configured as the transactional part of the cluster.
@@ -37,36 +37,45 @@ Key points:
3737
* The servers for analytics have mode constraints configured that restrict their hosting mode to _secondary_ to prevent them from participating in normal write operations.
3838
* In the example below, you set `dbms.cluster.discovery.resolver_type=LIST`.
3939

40+
To use the discovery service v2:
41+
42+
* You have to set the configuration of `dbms.cluster.discovery.version` to `V2_ONLY`.
43+
* Instead of `dbms.cluster.discovery.endpoints`, use `dbms.cluster.discovery.v2.endpoints`.
44+
4045
._neo4j.conf_ on server01.example.com:
4146
[source, properties]
4247
----
4348
server.default_listen_address=0.0.0.0
4449
server.default_advertised_address=server01.example.com
45-
dbms.cluster.discovery.endpoints=server01.example.com:5000,server02.example.com:5000,server03.example.com:5000,server04.example.com:5000,server05.example.com:5000
50+
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000,server02.example.com:6000,server03.example.com:6000,server04.example.com:6000,server05.example.com:6000
51+
dbms.cluster.discovery.version=V2_ONLY
4652
----
4753

4854
._neo4j.conf_ on server02.example.com:
4955
[source, properties]
5056
----
5157
server.default_listen_address=0.0.0.0
5258
server.default_advertised_address=server02.example.com
53-
dbms.cluster.discovery.endpoints=server01.example.com:5000,server02.example.com:5000,server03.example.com:5000,server04.example.com:5000,server05.example.com:5000
59+
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000,server02.example.com:6000,server03.example.com:6000,server04.example.com:6000,server05.example.com:6000
60+
dbms.cluster.discovery.version=V2_ONLY
5461
----
5562

5663
._neo4j.conf_ on server03.example.com:
5764
[source, properties]
5865
----
5966
server.default_listen_address=0.0.0.0
6067
server.default_advertised_address=server03.example.com
61-
dbms.cluster.discovery.endpoints=server01.example.com:5000,server02.example.com:5000,server03.example.com:5000,server04.example.com:5000,server05.example.com:5000
68+
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000,server02.example.com:6000,server03.example.com:6000,server04.example.com:6000,server05.example.com:6000
69+
dbms.cluster.discovery.version=V2_ONLY
6270
----
6371

6472
._neo4j.conf_ on server04.example.com - an analytics server:
6573
[source, properties]
6674
----
6775
server.default_listen_address=0.0.0.0
6876
server.default_advertised_address=server04.example.com
69-
dbms.cluster.discovery.endpoints=server01.example.com:5000,server02.example.com:5000,server03.example.com:5000,server04.example.com:5000,server05.example.com:5000
77+
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000,server02.example.com:6000,server03.example.com:6000,server04.example.com:6000,server05.example.com:6000
78+
dbms.cluster.discovery.version=V2_ONLY
7079
initial.server.mode_constraint=SECONDARY
7180
server.cluster.system_database_mode=SECONDARY
7281
----
@@ -76,7 +85,8 @@ server.cluster.system_database_mode=SECONDARY
7685
----
7786
server.default_listen_address=0.0.0.0
7887
server.default_advertised_address=server05.example.com
79-
dbms.cluster.discovery.endpoints=server01.example.com:5000,server02.example.com:5000,server03.example.com:5000,server04.example.com:5000,server05.example.com:5000
88+
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000,server02.example.com:6000,server03.example.com:6000,server04.example.com:6000,server05.example.com:6000
89+
dbms.cluster.discovery.version=V2_ONLY
8090
initial.server.mode_constraint=SECONDARY
8191
server.cluster.system_database_mode=SECONDARY
8292
----
@@ -124,8 +134,9 @@ SHOW SERVERS YIELD *;
124134
| "9207bfd9-aa1b-40c2-b965-edcd3955a20e" | "9207bfd9-aa1b-40c2-b965-edcd3955a20e" | "server05:7687" | "Free" | "Available" | ["system"] | [] | [] | [] | [] | "SECONDARY" | "5.8.0" |
125135
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
126136
----
137+
127138
======
128-
[role=include-with-Discovery-service-v2 label--new-5.23]
139+
[role=include-with-Discovery-service-v1 label--deprecated-5.23]
129140
======
130141

131142
In this example, three servers named `server01.example.com`, `server02.example.com` and `server03.example.com` are configured as the transactional part of the cluster.
@@ -139,45 +150,36 @@ Key points:
139150
* The servers for analytics have mode constraints configured that restrict their hosting mode to _secondary_ to prevent them from participating in normal write operations.
140151
* In the example below, you set `dbms.cluster.discovery.resolver_type=LIST`.
141152

142-
To use the discovery service v2:
143-
144-
* You have to set the configuration of `dbms.cluster.discovery.version` to `V2_ONLY`.
145-
* Instead of `dbms.cluster.discovery.endpoints`, use `dbms.cluster.discovery.v2.endpoints`.
146-
147153
._neo4j.conf_ on server01.example.com:
148154
[source, properties]
149155
----
150156
server.default_listen_address=0.0.0.0
151157
server.default_advertised_address=server01.example.com
152-
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000,server02.example.com:6000,server03.example.com:6000,server04.example.com:6000,server05.example.com:6000
153-
dbms.cluster.discovery.version=V2_ONLY
158+
dbms.cluster.discovery.endpoints=server01.example.com:5000,server02.example.com:5000,server03.example.com:5000,server04.example.com:5000,server05.example.com:5000
154159
----
155160

156161
._neo4j.conf_ on server02.example.com:
157162
[source, properties]
158163
----
159164
server.default_listen_address=0.0.0.0
160165
server.default_advertised_address=server02.example.com
161-
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000,server02.example.com:6000,server03.example.com:6000,server04.example.com:6000,server05.example.com:6000
162-
dbms.cluster.discovery.version=V2_ONLY
166+
dbms.cluster.discovery.endpoints=server01.example.com:5000,server02.example.com:5000,server03.example.com:5000,server04.example.com:5000,server05.example.com:5000
163167
----
164168

165169
._neo4j.conf_ on server03.example.com:
166170
[source, properties]
167171
----
168172
server.default_listen_address=0.0.0.0
169173
server.default_advertised_address=server03.example.com
170-
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000,server02.example.com:6000,server03.example.com:6000,server04.example.com:6000,server05.example.com:6000
171-
dbms.cluster.discovery.version=V2_ONLY
174+
dbms.cluster.discovery.endpoints=server01.example.com:5000,server02.example.com:5000,server03.example.com:5000,server04.example.com:5000,server05.example.com:5000
172175
----
173176

174177
._neo4j.conf_ on server04.example.com - an analytics server:
175178
[source, properties]
176179
----
177180
server.default_listen_address=0.0.0.0
178181
server.default_advertised_address=server04.example.com
179-
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000,server02.example.com:6000,server03.example.com:6000,server04.example.com:6000,server05.example.com:6000
180-
dbms.cluster.discovery.version=V2_ONLY
182+
dbms.cluster.discovery.endpoints=server01.example.com:5000,server02.example.com:5000,server03.example.com:5000,server04.example.com:5000,server05.example.com:5000
181183
initial.server.mode_constraint=SECONDARY
182184
server.cluster.system_database_mode=SECONDARY
183185
----
@@ -187,8 +189,7 @@ server.cluster.system_database_mode=SECONDARY
187189
----
188190
server.default_listen_address=0.0.0.0
189191
server.default_advertised_address=server05.example.com
190-
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000,server02.example.com:6000,server03.example.com:6000,server04.example.com:6000,server05.example.com:6000
191-
dbms.cluster.discovery.version=V2_ONLY
192+
dbms.cluster.discovery.endpoints=server01.example.com:5000,server02.example.com:5000,server03.example.com:5000,server04.example.com:5000,server05.example.com:5000
192193
initial.server.mode_constraint=SECONDARY
193194
server.cluster.system_database_mode=SECONDARY
194195
----
@@ -236,7 +237,6 @@ SHOW SERVERS YIELD *;
236237
| "9207bfd9-aa1b-40c2-b965-edcd3955a20e" | "9207bfd9-aa1b-40c2-b965-edcd3955a20e" | "server05:7687" | "Free" | "Available" | ["system"] | [] | [] | [] | [] | "SECONDARY" | "5.8.0" |
237238
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
238239
----
239-
240240
======
241241
=====
242242

@@ -280,9 +280,8 @@ The following example shows how to set up a non-fault tolerant analytics cluster
280280

281281
[.tabbed-example]
282282
=====
283-
[role=include-with-Discovery-service-v1 label--deprecated-5.23]
283+
[role=include-with-Discovery-service-v2 label--new-5.23]
284284
======
285-
286285
In this example, three servers named `server01.example.com`, `server02.example.com` and `server03.example.com` are configured.
287286
Neo4j Enterprise Edition is installed on all three servers.
288287
They are configured by preparing xref:configuration/file-locations.adoc[_neo4j.conf_] on each server.
@@ -297,22 +296,28 @@ This is required in order to have a cluster with only a single primary for the `
297296
* The servers for analytics have mode constraints configured that restrict their hosting mode to _secondary_ to prevent them from participating in normal write operations.
298297
* In the example below, you set `dbms.cluster.discovery.resolver_type=LIST`.
299298

299+
To use the discovery service v2:
300+
301+
* You have to set the configuration of `dbms.cluster.discovery.version` to `V2_ONLY`.
302+
* Instead of `dbms.cluster.discovery.endpoints`, use `dbms.cluster.discovery.v2.endpoints`.
300303

301304
._neo4j.conf_ on server01.example.com - the writer:
302305
[source, properties]
303306
----
304307
server.default_listen_address=0.0.0.0
305308
server.default_advertised_address=server01.example.com
306309
# Only has self in this list
307-
dbms.cluster.discovery.endpoints=server01.example.com:5000
310+
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000
311+
dbms.cluster.discovery.version=V2_ONLY
308312
----
309313

310314
._neo4j.conf_ on server02.example.com - an analytics server:
311315
[source, properties]
312316
----
313317
server.default_listen_address=0.0.0.0
314318
server.default_advertised_address=server02.example.com
315-
dbms.cluster.discovery.endpoints=server01.example.com:5000,server02.example.com:5000,server03.example.com:5000
319+
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000,server02.example.com:6000,server03.example.com:6000
320+
dbms.cluster.discovery.version=V2_ONLY
316321
initial.server.mode_constraint=SECONDARY
317322
server.cluster.system_database_mode=SECONDARY
318323
----
@@ -322,7 +327,8 @@ server.cluster.system_database_mode=SECONDARY
322327
----
323328
server.default_listen_address=0.0.0.0
324329
server.default_advertised_address=server03.example.com
325-
dbms.cluster.discovery.endpoints=server01.example.com:5000,server02.example.com:5000,server03.example.com:5000
330+
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000,server02.example.com:6000,server03.example.com:6000
331+
dbms.cluster.discovery.version=V2_ONLY
326332
initial.server.mode_constraint=SECONDARY
327333
server.cluster.system_database_mode=SECONDARY
328334
----
@@ -366,10 +372,10 @@ SHOW SERVERS YIELD *;
366372
| "73e9a990-0a97-4a09-91e9-622bf0b239a4" | "73e9a990-0a97-4a09-91e9-622bf0b239a4" | "server03:7687" | "Free" | "Available" | ["system"] | ["system"] | [] | [] | [] | "SECONDARY" | "5.8.0" |
367373
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
368374
----
369-
370375
======
371-
[role=include-with-Discovery-service-v2 label--new-5.23]
376+
[role=include-with-Discovery-service-v1 label--deprecated-5.23]
372377
======
378+
373379
In this example, three servers named `server01.example.com`, `server02.example.com` and `server03.example.com` are configured.
374380
Neo4j Enterprise Edition is installed on all three servers.
375381
They are configured by preparing xref:configuration/file-locations.adoc[_neo4j.conf_] on each server.
@@ -384,28 +390,22 @@ This is required in order to have a cluster with only a single primary for the `
384390
* The servers for analytics have mode constraints configured that restrict their hosting mode to _secondary_ to prevent them from participating in normal write operations.
385391
* In the example below, you set `dbms.cluster.discovery.resolver_type=LIST`.
386392

387-
To use the discovery service v2:
388-
389-
* You have to set the configuration of `dbms.cluster.discovery.version` to `V2_ONLY`.
390-
* Instead of `dbms.cluster.discovery.endpoints`, use `dbms.cluster.discovery.v2.endpoints`.
391393

392394
._neo4j.conf_ on server01.example.com - the writer:
393395
[source, properties]
394396
----
395397
server.default_listen_address=0.0.0.0
396398
server.default_advertised_address=server01.example.com
397399
# Only has self in this list
398-
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000
399-
dbms.cluster.discovery.version=V2_ONLY
400+
dbms.cluster.discovery.endpoints=server01.example.com:5000
400401
----
401402

402403
._neo4j.conf_ on server02.example.com - an analytics server:
403404
[source, properties]
404405
----
405406
server.default_listen_address=0.0.0.0
406407
server.default_advertised_address=server02.example.com
407-
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000,server02.example.com:6000,server03.example.com:6000
408-
dbms.cluster.discovery.version=V2_ONLY
408+
dbms.cluster.discovery.endpoints=server01.example.com:5000,server02.example.com:5000,server03.example.com:5000
409409
initial.server.mode_constraint=SECONDARY
410410
server.cluster.system_database_mode=SECONDARY
411411
----
@@ -415,8 +415,7 @@ server.cluster.system_database_mode=SECONDARY
415415
----
416416
server.default_listen_address=0.0.0.0
417417
server.default_advertised_address=server03.example.com
418-
dbms.cluster.discovery.v2.endpoints=server01.example.com:6000,server02.example.com:6000,server03.example.com:6000
419-
dbms.cluster.discovery.version=V2_ONLY
418+
dbms.cluster.discovery.endpoints=server01.example.com:5000,server02.example.com:5000,server03.example.com:5000
420419
initial.server.mode_constraint=SECONDARY
421420
server.cluster.system_database_mode=SECONDARY
422421
----
@@ -460,6 +459,7 @@ SHOW SERVERS YIELD *;
460459
| "73e9a990-0a97-4a09-91e9-622bf0b239a4" | "73e9a990-0a97-4a09-91e9-622bf0b239a4" | "server03:7687" | "Free" | "Available" | ["system"] | ["system"] | [] | [] | [] | "SECONDARY" | "5.8.0" |
461460
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
462461
----
462+
463463
======
464464
=====
465465

0 commit comments

Comments
 (0)