(Obsolete) 3.0 config

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "modules/cartridge"]
-	path = modules/cartridge
-	url = https://github.com/tarantool/cartridge.git
-[submodule "modules/cartridge-cli"]
-	path = modules/cartridge-cli
-	url = https://github.com/tarantool/cartridge-cli.git
 [submodule "modules/metrics"]
 	path = modules/metrics
 	url = https://github.com/tarantool/metrics.git

build_submodules.sh

@@ -12,50 +12,6 @@ po_dest="${project_root}/locale/ru/LC_MESSAGES"
 cp README.rst doc/contributing/docs/_includes/README.rst
 
 
-# Cartridge
-cartridge_root="${project_root}/modules/cartridge"
-
-# Build Cartridge to extract docs
-cd "${cartridge_root}" || exit
-CMAKE_DUMMY_WEBUI=true tarantoolctl rocks make
-
-# Copy Cartridge docs, including diagrams and images
-cartridge_rst_src="${cartridge_root}/build.luarocks/build.rst"
-cartridge_rst_dest="${project_root}/doc/book/cartridge"
-cd "${cartridge_rst_src}" || exit
-mkdir -p "${cartridge_rst_dest}"
-find . -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -r --parents {} "${cartridge_rst_dest}" \;
-
-# Copy translation templates
-cartridge_pot_src="${cartridge_root}/build.luarocks/build.rst/locale"
-cartridge_pot_dest="${project_root}/locale/book/cartridge"
-cd "${cartridge_pot_src}" || exit
-mkdir -p "${cartridge_pot_dest}"
-find . -name '*.pot' -exec cp -rv --parents {} "${cartridge_pot_dest}" \;
-
-# Copy translations
-cartridge_po_src="${cartridge_root}/build.luarocks/build.rst/locale/ru/LC_MESSAGES"
-cartridge_po_dest="${po_dest}/book/cartridge"
-cd "${cartridge_po_src}" || exit
-mkdir -p "${cartridge_po_dest}"
-find . -name '*.po' -exec cp -rv --parents {} "${cartridge_po_dest}" \;
-
-
-# Cartridge CLI
-cartridge_cli_root="${project_root}/modules/cartridge-cli/doc"
-cartridge_cli_dest="${cartridge_rst_dest}/cartridge_cli"
-cartridge_cli_po_dest="${po_dest}/book/cartridge/cartridge_cli"
-
-# Copy Cartridge CLI docs, including diagrams and images
-mkdir -p "${cartridge_cli_dest}"
-cd ${cartridge_cli_root} || exit
-find . -iregex '.*\.\(rst\|png\|puml\|svg\)$' -exec cp -rv --parents {} "${cartridge_cli_dest}" \;
-
-# Copy translations
-mkdir -p "${cartridge_cli_po_dest}"
-cd "${cartridge_cli_root}/locale/ru/LC_MESSAGES/doc/" || exit
-find . -name '*.po' -exec cp -rv --parents {} "${cartridge_cli_po_dest}" \;
-
 # Monitoring
 monitoring_root="${project_root}/modules/metrics/doc/monitoring"
 monitoring_dest="${project_root}/doc/book"

conf.py

@@ -61,7 +61,7 @@
 project = u'Tarantool'
 
 # |release| The full version, including alpha/beta/rc tags.
-release = "2.11.1"
+release = "3.0.0"
 # |version| The short X.Y version.
 version = '.'.join(release.split('.')[0:2])
 
@@ -73,10 +73,6 @@
     'how-to/using_docker.rst',
     'reference/configuration/cfg_*',
     'images',
-    'book/cartridge/cartridge_overview.rst',
-    'book/cartridge/CONTRIBUTING.rst',
-    'book/cartridge/topics',
-    'book/cartridge/cartridge_api/modules/cartridge.test-helpers.rst',
     'reference/reference_rock/luatest/README.rst',
     'reference/reference_rock/luatest/modules/luatest.rst',
     '**/_includes/*'

doc/book/admin/start_stop_instance.rst

@@ -124,6 +124,8 @@ With a single ``tt`` call, you can:
 *   connect to a specific instance of an application
 *   stop a specific instance of an application or all its instances
 
+.. _admin-start_stop_instance-multi-instance-layout:
+
 Application layout
 ~~~~~~~~~~~~~~~~~~
 

doc/book/admin/upgrades/upgrade_cluster.rst

@@ -98,11 +98,11 @@ Upgrading storages
 
 Before upgrading **storage** instances:
 
-*   Disable :doc:`Cartridge failover </book/cartridge/cartridge_cli/commands/failover/>`: run
+*   Disable Cartridge failover: run
 
     ..  code-block:: bash
 
-        cartridge failover disable
+        tt cartridge failover disable
 
     or use the Cartridge web interface (**Cluster** tab, **Failover: <Mode>** button).
 
@@ -112,8 +112,7 @@ Before upgrading **storage** instances:
 
         tarantool> vshard.storage.rebalancer_disable()
 
-*   Make sure that the Cartridge ``upgrade_schema`` :doc:`option </book/cartridge/cartridge_api/modules/cartridge>`
-    is ``false``.
+*   Make sure that the Cartridge ``upgrade_schema`` option is ``false``.
 
 ..  include:: ../_includes/upgrade_storages.rst
 
@@ -130,11 +129,11 @@ Before upgrading **storage** instances:
 
 Once you complete the steps, enable failover or rebalancer back:
 
-*   Enable :doc:`Cartridge failover </book/cartridge/cartridge_cli/commands/failover/>`: run
+*   Enable Cartridge failover: run
 
     ..  code-block:: bash
 
-        cartridge failover set [mode]
+        tt cartridge failover set [mode]
 
     or use the Cartridge web interface (**Cluster** tab, **Failover: Disabled** button).
 

doc/book/connectors/java.rst

@@ -8,7 +8,7 @@ There are two Java connectors available:
 *   `cartridge-java <http://github.com/tarantool/cartridge-java/>`__
     supports both single Tarantool nodes and clusters,
     as well as applications built using the
-    :doc:`Cartridge framework </book/cartridge/index>` and its modules.
+    `Cartridge framework <https://github.com/tarantool/cartridge>`__ and its modules.
     The Tarantool team actively updates this module with the newest Tarantool features.
 *   `tarantool-java <http://github.com/tarantool/tarantool-java/>`__
     works with early Tarantool versions (1.6 and later)

doc/book/index.rst

@@ -15,7 +15,6 @@ User's Guide
     ../how-to/index
     ../concepts/index
     box/index
-    cartridge/index
     admin/index
     monitoring/index
     connectors

doc/code_snippets/test/config/config_test.lua

@@ -0,0 +1,72 @@
+local fio = require('fio')
+local server = require('luatest.server')
+local t = require('luatest')
+local treegen = require('test.treegen')
+local justrun = require('test.justrun')
+local g = t.group()
+
+g.before_all(function()
+    treegen.init(g)
+end)
+
+g.after_all(function()
+    treegen.clean(g)
+end)
+
+g.before_each(function(cg)
+    cg.server = server:new {
+        box_cfg = {},
+        workdir = fio.cwd() .. '/tmp'
+    }
+    cg.server:start()
+    cg.server:exec(function()
+        box.schema.space.create('bands')
+        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)
+end)
+
+g.after_each(function(cg)
+    cg.server:stop()
+    cg.server:drop()
+end)
+
+g.test_config_option = function()
+    local dir = treegen.prepare_directory(g, {}, {})
+    local file_config = [[
+        log:
+          level: 7
+
+        memtx:
+          min_tuple_size: 32
+          memory: 100000000
+
+        groups:
+          group-001:
+            replicasets:
+              replicaset-001:
+                instances:
+                  instance-001: {}
+    ]]
+    treegen.write_script(dir, 'config.yaml', file_config)
+
+    local script = [[
+        print(box.cfg.memtx_min_tuple_size)
+        print(box.cfg.memtx_memory)
+        print(box.cfg.log_level)
+        os.exit(0)
+    ]]
+    treegen.write_script(dir, 'main.lua', script)
+
+    local env = {TT_LOG_LEVEL = 0}
+    local opts = {nojson = true, stderr = false}
+    local args = {'--name', 'instance-001', '--config', 'config.yaml',
+                  'main.lua'}
+    local res = justrun.tarantool(dir, env, args, opts)
+    t.assert_equals(res.exit_code, 0)
+    t.assert_equals(res.stdout, table.concat({32, 100000000, 0}, "\n"))
+end

doc/code_snippets/test/config/etcd.yaml

@@ -0,0 +1,5 @@
+config:
+  etcd:
+    prefix: /example
+    endpoints:
+    - http://localhost:2379

doc/code_snippets/test/config/instances.yml

@@ -0,0 +1,3 @@
+app.instance-001:
+app.instance-002:
+app.instance-003:

doc/code_snippets/test/config/iproto_global_scope.yaml

@@ -0,0 +1,9 @@
+iproto:
+  listen: "3301"
+
+groups:
+  group-001:
+    replicasets:
+      replicaset-001:
+        instances:
+          instance-001: {}

doc/code_snippets/test/config/iproto_group_scope.yaml

@@ -0,0 +1,8 @@
+groups:
+  group-001:
+    iproto:
+      listen: "3301"
+    replicasets:
+      replicaset-001:
+        instances:
+          instance-001: {}

doc/code_snippets/test/config/iproto_instance_scope.yaml

@@ -0,0 +1,8 @@
+groups:
+  group-001:
+    replicasets:
+      replicaset-001:
+        instances:
+          instance-001:
+            iproto:
+              listen: "3301"

doc/code_snippets/test/config/iproto_replicaset_scope.yaml

@@ -0,0 +1,8 @@
+groups:
+  group-001:
+    replicasets:
+      replicaset-001:
+        iproto:
+          listen: "3301"
+        instances:
+          instance-001: {}

doc/code_snippets/test/config/myapp.lua

@@ -0,0 +1,3 @@
+local log = require('log').new("myapp")
+local config = require('config')
+log.info("%s from app, %s!", config:get('app.cfg.greeting'), box.info.name)

doc/code_snippets/test/config/replicaset_automatic.yaml

@@ -0,0 +1,30 @@
+credentials:
+  users:
+    replicator:
+      password: 'topsecret'
+      roles: [replication]
+    client:
+      password: 'secret'
+      roles: [super]
+
+iproto:
+  advertise:
+    peer: replicator@
+
+replication:
+  failover: election
+
+groups:
+  group-001:
+    replicasets:
+      replicaset-001:
+        instances:
+          instance-001:
+            iproto:
+              listen: 127.0.0.1:3301
+          instance-002:
+            iproto:
+              listen: 127.0.0.1:3302
+          instance-003:
+            iproto:
+              listen: 127.0.0.1:3303

doc/code_snippets/test/config/replicaset_manual.yaml

@@ -0,0 +1,31 @@
+credentials:
+  users:
+    replicator:
+      password: 'topsecret'
+      roles: [replication]
+    client:
+      password: 'secret'
+      roles: [super]
+
+iproto:
+  advertise:
+    peer: replicator@
+
+replication:
+  failover: manual
+
+groups:
+  group-001:
+    replicasets:
+      replicaset-001:
+        leader: instance-001
+        instances:
+          instance-001:
+            iproto:
+              listen: 127.0.0.1:3301
+          instance-002:
+            iproto:
+              listen: 127.0.0.1:3302
+          instance-003:
+            iproto:
+              listen: 127.0.0.1:3303