Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
oleg-jukovec committed Apr 9, 2024
1 parent 35fabfe commit 6df38a6
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 24 deletions.
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ You need to install the Tarantool 3.0.2+ or 3.1+.
1. Add a dependency to your application rockspec.
2. Enable `roles.sharded-queue-router` role on all sharding `router` instances.
3. Enable `roles.sharded-queue-storage` role on all sharding `storage`
isntances.
instances.
4. Configure tubes for both roles.
5. Do not forget to bootstrap the vshard in your application. See
[router.lua][./router.lua] as an example.
[init.lua](./init.lua) as an example.

You could see a full example of the configuration in the [config.yaml][./config.yaml].
You could see a full example of the configuration in the [config.yaml](./config.yaml).

Be careful, it is unable to create or drop tubes dynamically by API calls
with Tarantool 3. You need to update the cluster configuration instead.
Be careful, it is impossible to create or drop tubes dynamically by API calls
with Tarantool 3. You need to update the role configuration instead.

## Usage in a Tarantool Cartridge application

Expand Down Expand Up @@ -184,8 +184,8 @@ Say:
```shell
make deps
make deps-cartridge # For Tarantool <3.
make deps-metrics # For Tarantool <3.
make deps-cartridge # For Tarantool < 3.
make deps-metrics # For Tarantool < 3.
make test
```
Expand Down Expand Up @@ -289,8 +289,8 @@ installed and the feature is not disabled by the configuration.
If you use **fifottl** driver (default), you can log driver's method calls with `log_request` (log router's and storage's operations).
* You could not to create or to drop tubes by API calls with Tarantool 3. You
need to update the cluster configuration instead.
* You can not create or drop tubes by API calls with Tarantool 3. You need
to update the role configuration instead.
[metrics-summary]: https://www.tarantool.io/en/doc/latest/book/monitoring/api_reference/#summary
[queue-statistics]: https://github.com/tarantool/queue?tab=readme-ov-file#getting-statistics
1 change: 0 additions & 1 deletion test/entrypoint/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ groups:
queue-router-1:
database:
instance_uuid: 'aaaaaaaa-aaaa-4000-b000-000000000002'
mode: rw
replicaset-002:
sharding:
roles: [storage]
Expand Down
7 changes: 0 additions & 7 deletions test/helper/config_cartridge.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ local config = {}
config.root = fio.dirname(fio.abspath(package.search('init')))

config.datadir = fio.pathjoin(config.root, 'dev')
config.unitdir = fio.pathjoin(config.datadir, 'unit')

config.cluster = cartridge_helpers.Cluster:new({
datadir = config.datadir,
Expand Down Expand Up @@ -119,12 +118,6 @@ t.before_suite(function()
for _, srv in pairs(config.cluster.servers) do
config.servers[srv.alias] = srv
end

fio.mktree(config.unitdir)
box.cfg{
work_dir=config.unitdir,
wal_mode='none'
}
end)

t.after_suite(function()
Expand Down
7 changes: 0 additions & 7 deletions test/helper/config_tarantool.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ local roles = {
}
config.root = fio.dirname(fio.abspath(package.search('init')))
config.datadir = fio.pathjoin(config.root, 'dev')
config.unitdir = fio.pathjoin(config.datadir, 'unit')
config.configpath = fio.pathjoin(config.root, 'test', 'entrypoint', 'config.yml')
config.devconfigpath = fio.pathjoin(config.root, 'dev', 'config.yml')

Expand Down Expand Up @@ -173,12 +172,6 @@ t.before_suite(function()
fio.pathjoin(config.datadir, 'sharded_queue'))

config.start_example_replicaset()

fio.mktree(config.unitdir)
box.cfg{
work_dir=config.unitdir,
wal_mode='none'
}
end)

t.after_suite(function()
Expand Down

0 comments on commit 6df38a6

Please sign in to comment.