3.0 configuration: update replication tutorials

andreyaksenov · andreyaksenov · commit 7153397e1964 · 2023-11-22T11:41:05.000+03:00
diff --git a/doc/code_snippets/snippets/replication/instances.enabled/auto_leader/data.lua b/doc/code_snippets/snippets/replication/instances.enabled/auto_leader/data.lua
@@ -8,16 +8,6 @@ function create_space()
     box.space.bands:create_index('primary', { parts = { 'id' } })
 end
 
-function create_sync_space()
-    box.schema.space.create('bands', { is_sync = true })
-    box.space.bands:format({
-        { name = 'id', type = 'unsigned' },
-        { name = 'band_name', type = 'string' },
-        { name = 'year', type = 'unsigned' }
-    })
-    box.space.bands:create_index('primary', { parts = { 'id' } })
-end
-
 function load_data()
     box.space.bands:insert { 1, 'Roxette', 1986 }
     box.space.bands:insert { 2, 'Scorpions', 1965 }
diff --git a/doc/code_snippets/snippets/replication/instances.enabled/auto_leader_sync/config.yaml b/doc/code_snippets/snippets/replication/instances.enabled/auto_leader_sync/config.yaml
@@ -0,0 +1,33 @@
+credentials:
+  users:
+    replicator:
+      password: 'topsecret'
+      roles: [replication]
+
+iproto:
+  advertise:
+    peer: replicator@
+
+replication:
+  synchro_quorum: 3
+  election_fencing_mode: off
+  failover: election
+
+groups:
+  group001:
+    replicasets:
+      replicaset001:
+        instances:
+          instance001:
+            iproto:
+              listen: 127.0.0.1:3301
+          instance002:
+            iproto:
+              listen: 127.0.0.1:3302
+          instance003:
+            iproto:
+              listen: 127.0.0.1:3303
+
+# Load sample data
+app:
+  file: 'data.lua'
diff --git a/doc/code_snippets/snippets/replication/instances.enabled/auto_leader_sync/data.lua b/doc/code_snippets/snippets/replication/instances.enabled/auto_leader_sync/data.lua
@@ -0,0 +1,22 @@
+function create_sync_space()
+    box.schema.space.create('bands', { is_sync = true })
+    box.space.bands:format({
+        { name = 'id', type = 'unsigned' },
+        { name = 'band_name', type = 'string' },
+        { name = 'year', type = 'unsigned' }
+    })
+    box.space.bands:create_index('primary', { parts = { 'id' } })
+end
+
+function load_data()
+    box.space.bands:insert { 1, 'Roxette', 1986 }
+    box.space.bands:insert { 2, 'Scorpions', 1965 }
+    box.space.bands:insert { 3, 'Ace of Base', 1987 }
+    box.space.bands:insert { 4, 'The Beatles', 1960 }
+    box.space.bands:insert { 5, 'Pink Floyd', 1965 }
+    box.space.bands:insert { 6, 'The Rolling Stones', 1962 }
+    box.space.bands:insert { 7, 'The Doors', 1965 }
+    box.space.bands:insert { 8, 'Nirvana', 1987 }
+    box.space.bands:insert { 9, 'Led Zeppelin', 1968 }
+    box.space.bands:insert { 10, 'Queen', 1970 }
+end
diff --git a/doc/code_snippets/snippets/replication/instances.enabled/auto_leader_sync/instances.yml b/doc/code_snippets/snippets/replication/instances.enabled/auto_leader_sync/instances.yml
@@ -0,0 +1,3 @@
+instance001:
+instance002:
+instance003:
diff --git a/doc/code_snippets/snippets/replication/instances.enabled/manual_leader/myapp.lua b/doc/code_snippets/snippets/replication/instances.enabled/manual_leader/myapp.lua
@@ -8,16 +8,6 @@ function create_space()
     box.space.bands:create_index('primary', { parts = { 'id' } })
 end
 
-function create_sync_space()
-    box.schema.space.create('bands', { is_sync = true })
-    box.space.bands:format({
-        { name = 'id', type = 'unsigned' },
-        { name = 'band_name', type = 'string' },
-        { name = 'year', type = 'unsigned' }
-    })
-    box.space.bands:create_index('primary', { parts = { 'id' } })
-end
-
 function load_data()
     box.space.bands:insert { 1, 'Roxette', 1986 }
     box.space.bands:insert { 2, 'Scorpions', 1965 }
diff --git a/doc/code_snippets/snippets/replication/instances.enabled/manual_leader_sync/config.yaml b/doc/code_snippets/snippets/replication/instances.enabled/manual_leader_sync/config.yaml
@@ -0,0 +1,36 @@
+credentials:
+  users:
+    replicator:
+      password: 'topsecret'
+      roles: [replication]
+    client:
+      password: 'secret'
+      roles: [super]
+
+iproto:
+  advertise:
+    peer: replicator@
+
+replication:
+  synchro_quorum: 3
+  failover: manual
+
+groups:
+  group001:
+    replicasets:
+      replicaset001:
+        leader: instance001
+        instances:
+          instance001:
+            iproto:
+              listen: 127.0.0.1:3301
+          instance002:
+            iproto:
+              listen: 127.0.0.1:3302
+          instance003:
+            iproto:
+              listen: 127.0.0.1:3303
+
+# Load sample data
+app:
+  file: 'myapp.lua'
diff --git a/doc/code_snippets/snippets/replication/instances.enabled/manual_leader_sync/instances.yml b/doc/code_snippets/snippets/replication/instances.enabled/manual_leader_sync/instances.yml
@@ -0,0 +1,3 @@
+instance001:
+instance002:
+instance003:
diff --git a/doc/code_snippets/snippets/replication/instances.enabled/manual_leader_sync/myapp.lua b/doc/code_snippets/snippets/replication/instances.enabled/manual_leader_sync/myapp.lua
@@ -0,0 +1,22 @@
+function create_sync_space()
+    box.schema.space.create('bands', { is_sync = true })
+    box.space.bands:format({
+        { name = 'id', type = 'unsigned' },
+        { name = 'band_name', type = 'string' },
+        { name = 'year', type = 'unsigned' }
+    })
+    box.space.bands:create_index('primary', { parts = { 'id' } })
+end
+
+function load_data()
+    box.space.bands:insert { 1, 'Roxette', 1986 }
+    box.space.bands:insert { 2, 'Scorpions', 1965 }
+    box.space.bands:insert { 3, 'Ace of Base', 1987 }
+    box.space.bands:insert { 4, 'The Beatles', 1960 }
+    box.space.bands:insert { 5, 'Pink Floyd', 1965 }
+    box.space.bands:insert { 6, 'The Rolling Stones', 1962 }
+    box.space.bands:insert { 7, 'The Doors', 1965 }
+    box.space.bands:insert { 8, 'Nirvana', 1987 }
+    box.space.bands:insert { 9, 'Led Zeppelin', 1968 }
+    box.space.bands:insert { 10, 'Queen', 1970 }
+end
diff --git a/doc/code_snippets/snippets/replication/instances.enabled/master_master/config.yaml b/doc/code_snippets/snippets/replication/instances.enabled/master_master/config.yaml
@@ -25,4 +25,9 @@ groups:
             database:
               mode: rw
             iproto:
-              listen: 127.0.0.1:3302
+              listen: 127.0.0.1:3302
+          instance003:
+            database:
+              mode: rw
+            iproto:
+              listen: 127.0.0.1:3303
diff --git a/doc/code_snippets/snippets/replication/instances.enabled/master_master/instances.yml b/doc/code_snippets/snippets/replication/instances.enabled/master_master/instances.yml
@@ -1,2 +1,3 @@
 instance001:
-instance002:
+instance002:
+instance003:
diff --git a/doc/code_snippets/snippets/replication/tt.yaml b/doc/code_snippets/snippets/replication/tt.yaml
@@ -1,63 +1,54 @@
-tt:
-  modules:
-    # Directory where the external modules are stored.
-    directory: "modules"
+modules:
+  # Directory where the external modules are stored.
+  directory: modules
 
-  app:
-    # Directory that stores various instance runtime
-    # artifacts like console socket, PID file, etc.
-    run_dir: "var/run"
+env:
+  # Restart instance on failure.
+  restart_on_failure: false
 
-    # Directory that stores log files.
-    log_dir: var/log
+  # Directory that stores binary files.
+  bin_dir: bin
 
-    # The maximum size in MB of the log file before it gets rotated.
-    log_maxsize: 100
+  # Directory that stores Tarantool header files.
+  inc_dir: include
 
-    # The maximum number of days to retain old log files.
-    log_maxage: 8
+  # Path to directory that stores all applications.
+  # The directory can also contain symbolic links to applications.
+  instances_enabled: instances.enabled
 
-    # The maximum number of old log files to retain.
-    log_maxbackups: 10
+  # Tarantoolctl artifacts layout compatibility: if set to true tt will not create application
+  # sub-directories for control socket, pid files, log files, etc.. Data files (wal, vinyl,
+  # snap) and multi-instance applications are not affected by this option.
+  tarantoolctl_layout: false
 
-    # Restart instance on failure.
-    restart_on_failure: false
+app:
+  # Directory that stores various instance runtime
+  # artifacts like console socket, PID file, etc.
+  run_dir: var/run
 
-    # Directory where write-ahead log (.xlog) files are stored.
-    wal_dir: "var/lib"
+  # Directory that stores log files.
+  log_dir: var/log
 
-    # Directory where memtx stores snapshot (.snap) files.
-    memtx_dir: "var/lib"
+  # Directory where write-ahead log (.xlog) files are stored.
+  wal_dir: var/lib
 
-    # Directory where vinyl files or subdirectories will be stored.
-    vinyl_dir: "var/lib"
+  # Directory where memtx stores snapshot (.snap) files.
+  memtx_dir: var/lib
 
-    # Directory that stores binary files.
-    bin_dir: "bin"
+  # Directory where vinyl files or subdirectories will be stored.
+  vinyl_dir: var/lib
 
-    # Directory that stores Tarantool header files.
-    inc_dir: "include"
+# Path to file with credentials for downloading Tarantool Enterprise Edition.
+# credential_path: /path/to/file
+ee:
+  credential_path: 
 
-    # Path to directory that stores all applications.
-    # The directory can also contain symbolic links to applications.
-    instances_enabled: "instances.enabled"
+templates:
+  # The path to templates search directory.
+  - path: templates
 
-    # Tarantoolctl artifacts layout compatibility: if set to true tt will not create application
-    # sub-directories for control socket, pid files, log files, etc.. Data files (wal, vinyl,
-    # snap) and multi-instance applications are not affected by this option.
-    tarantoolctl_layout: false
-
-  # Path to file with credentials for downloading Tarantool Enterprise Edition.
-  # credential_path: /path/to/file
-  ee:
-    credential_path: ""
-
-  templates:
-    # The path to templates search directory.
-    - path: "templates"
-
-  repo:
-    # Directory where local rocks files could be found.
-    rocks: ""
-    # Directory that stores installation files.
-    distfiles: "distfiles"
+repo:
+  # Directory where local rocks files could be found.
+  rocks: 
+  # Directory that stores installation files.
+  distfiles: distfiles
diff --git a/doc/concepts/replication/repl_architecture.rst b/doc/concepts/replication/repl_architecture.rst
@@ -47,7 +47,7 @@ The following are specifics of adding different types of information to the WAL:
 *    Data change operations on **replication-local** spaces (:doc:`created </reference/reference_lua/box_schema/space_create>` with ``is_local = true``) are written to the WAL but are not replicated.
 
 
-To learn how to enable replication, check the :ref:`Bootstrapping a replica set <replication-setup>` guide.
+To learn how to enable replication, check the :ref:`Bootstrapping a replica set <replication-bootstrap>` guide.
 
 
 .. _replication_stages:
diff --git a/doc/how-to/replication/repl_add_instances.rst b/doc/how-to/replication/repl_add_instances.rst
diff --git a/doc/how-to/replication/repl_bootstrap.rst b/doc/how-to/replication/repl_bootstrap.rst
diff --git a/doc/how-to/replication/repl_leader_elect.rst b/doc/how-to/replication/repl_leader_elect.rst
diff --git a/doc/how-to/replication/repl_remove_instances.rst b/doc/how-to/replication/repl_remove_instances.rst
diff --git a/doc/how-to/replication/repl_sync.rst b/doc/how-to/replication/repl_sync.rst
diff --git a/locale/ru/LC_MESSAGES/concepts/replication/repl_architecture.po b/locale/ru/LC_MESSAGES/concepts/replication/repl_architecture.po

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+instance001:`
	`2`	`+instance002:`
	`3`	`+instance003:`