From 7d0cc86088baa88d873ac76d837a73f1b95ce497 Mon Sep 17 00:00:00 2001 From: Igor Zolotarev Date: Thu, 17 Feb 2022 11:50:57 +0300 Subject: [PATCH 01/10] Add new metrics - tnt_replication_upstream__lag - tnt_replication_downstream__lag - tnt_vinyl_regulator_blocked_writers - tnt_net_requests_in_progress_total - tnt_net_requests_in_progress_current - tnt_net_requests_in_stream_total - tnt_net_requests_in_stream_current --- CHANGELOG.md | 8 ++++++ Makefile | 2 +- doc/monitoring/metrics_reference.rst | 37 ++++++++++++++++++++++++++-- metrics/tarantool/info.lua | 12 +++++++-- metrics/tarantool/network.lua | 19 ++++++++++++++ metrics/tarantool/vinyl.lua | 4 +++ test/tarantool/vinyl_test.lua | 2 +- 7 files changed, 78 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 772445ac..4f692f99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,6 +28,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `tnt_cpu_number` (same as `tnt_cpu_count`) - `tnt_cpu_time` (same as `tnt_cpu_total`) - `tnt_vinyl_scheduler_dump_total` (same as `tnt_vinyl_scheduler_dump_count`) + - `tnt_replication_upstream__lag` (same as `tnt_replication__lag`) + - `tnt_replication_downstream__lag` + - `tnt_vinyl_regulator_blocked_writers` + - `tnt_net_requests_in_progress_total` + - `tnt_net_requests_in_progress_current` + - `tnt_net_requests_in_stream_total` + - `tnt_net_requests_in_stream_current` ### Deprecated @@ -43,6 +50,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `tnt_cpu_count` - `tnt_cpu_total` - `tnt_vinyl_scheduler_dump_count` + - `tnt_replication__lag` ## [0.12.0] - 2021-11-18 ### Changed diff --git a/Makefile b/Makefile index 2bb71d80..4f615278 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ rpm: .rocks: metrics-scm-1.rockspec tarantoolctl rocks make - tarantoolctl rocks install luatest 0.5.6 + tarantoolctl rocks install luatest 0.5.7 tarantoolctl rocks install luacov 0.13.0 tarantoolctl rocks install luacheck 0.26.0 if [ -z $(CARTRIDGE_VERSION) ]; then \ diff --git a/doc/monitoring/metrics_reference.rst b/doc/monitoring/metrics_reference.rst index fe0176c6..a319e38b 100644 --- a/doc/monitoring/metrics_reference.rst +++ b/doc/monitoring/metrics_reference.rst @@ -219,6 +219,33 @@ Requests: * - ``tnt_net_requests_current`` - Number of pending network requests +Requests in progress: + +.. container:: table + + .. list-table:: + :widths: 25 75 + :header-rows: 0 + + * - ``tnt_net_requests_in_progress_total`` + - Total count of requests processed by tx thread + * - ``tnt_net_requests_in_progress_current`` + - Count of requests currently being processed in the tx thread + +Requests placed in queues of streams: + +.. container:: table + + .. list-table:: + :widths: 25 75 + :header-rows: 0 + + * - ``tnt_net_requests_in_stream_total`` + - Total count of requests, which was placed in queues of streams + for all time + * - ``tnt_net_requests_in_stream_current`` + - Count of requests currently waiting in queues of streams + .. _metrics-reference-fibers: Fibers @@ -319,8 +346,11 @@ Learn more about :ref:`replication in Tarantool `. * - ``tnt_replication_replica__lsn`` / ``tnt_replication_master__lsn`` - LSN of the master/replica, where ``id`` is the instance's number in the replica set. - * - ``tnt_replication__lag`` - - Replication lag value in seconds, where + * - ``tnt_replication_upstream__lag`` + - Replication upstream lag value in seconds, where + ``id`` is the instance's number in the replica set. + * - ``tnt_replication_downstream__lag`` + - Replication downstream lag value in seconds, where ``id`` is the instance's number in the replica set. .. _metrics-reference-runtime: @@ -556,6 +586,9 @@ efficient. The value is slightly smaller than the amount of memory allocated for vinyl trees, reflected in the :ref:`vinyl_memory ` parameter. + * - ``tnt_vinyl_regulator_blocked_writers`` + - The number of fibers that are blocked waiting + for Vinyl level0 memory quota. Transactional activity ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/metrics/tarantool/info.lua b/metrics/tarantool/info.lua index b196e185..06e6f499 100644 --- a/metrics/tarantool/info.lua +++ b/metrics/tarantool/info.lua @@ -23,9 +23,17 @@ local function update_info_metrics() for k, v in ipairs(info.replication) do if v.upstream ~= nil then - local metric_name = 'replication_' .. k .. '_lag' + local metric_name_old = 'replication_' .. k .. '_lag' + collectors_list[metric_name_old] = + utils.set_gauge(metric_name_old, 'Replication lag for instance ' .. k, v.upstream.lag) + local metric_name = 'replication_upstream_' .. k .. '_lag' collectors_list[metric_name] = - utils.set_gauge(metric_name, 'Replication lag for instance ' .. k, v.upstream.lag) + utils.set_gauge(metric_name, 'Replication upstream lag for instance ' .. k, v.upstream.lag) + end + if v.downstream ~= nil then + local metric_name = 'replication_downstream' .. k .. '_lag' + collectors_list[metric_name] = + utils.set_gauge(metric_name, 'Replication downstream lag for instance ' .. k, v.downstream.lag) end end diff --git a/metrics/tarantool/network.lua b/metrics/tarantool/network.lua index 32ae674e..2b9ae939 100644 --- a/metrics/tarantool/network.lua +++ b/metrics/tarantool/network.lua @@ -41,6 +41,25 @@ local function update_network_metrics() collectors_list.net_requests_current = utils.set_gauge('net_requests_current', 'Pending requests', box_stat_net.REQUESTS.current) end + + if box_stat_net.REQUESTS_IN_PROGRESS ~= nil then + collectors_list.net_requests_in_progress_total = + utils.set_counter('net_requests_in_progress_total', 'Requests in progress total amount', + box_stat_net.REQUESTS_IN_PROGRESS.total) + collectors_list.net_requests_in_progress_current = + utils.set_gauge('net_requests_in_progress_current', + 'Count of requests currently being processed in the tx thread', box_stat_net.REQUESTS_IN_PROGRESS.current) + end + + if box_stat_net.REQUESTS_IN_STREAM_QUEUE ~= nil then + collectors_list.net_requests_in_stream_total = + utils.set_counter('net_requests_in_stream_queue_total', + 'Total count of requests, which was placed in queues of streams', + box_stat_net.REQUESTS_IN_STREAM_QUEUE.total) + collectors_list.net_requests_in_stream_current = + utils.set_gauge('net_requests_in_stream_queue_current', + 'count of requests currently waiting in queues of streams', box_stat_net.REQUESTS_IN_STREAM_QUEUE.current) + end end diff --git a/metrics/tarantool/vinyl.lua b/metrics/tarantool/vinyl.lua index 945d128f..f12e24e9 100644 --- a/metrics/tarantool/vinyl.lua +++ b/metrics/tarantool/vinyl.lua @@ -24,6 +24,10 @@ local function update() collectors_list.vinyl_regulator_dump_watermark = utils.set_gauge('vinyl_regulator_dump_watermark', 'Point when dumping must occur', vinyl_stat.regulator.dump_watermark) + collectors_list.vinyl_regulator_blocked_writers = + utils.set_gauge('vinyl_regulator_blocked_writers', 'The number of fibers that are blocked waiting ' .. + 'for Vinyl level0 memory quota', vinyl_stat.regulator.blocked_writers) + collectors_list.vinyl_tx_conflict = utils.set_gauge('vinyl_tx_conflict', 'Count of transaction conflicts', vinyl_stat.tx.conflict) diff --git a/test/tarantool/vinyl_test.lua b/test/tarantool/vinyl_test.lua index e187f812..915ecfbc 100644 --- a/test/tarantool/vinyl_test.lua +++ b/test/tarantool/vinyl_test.lua @@ -26,5 +26,5 @@ g.test_vinyl_metrics_present = function() local metrics_cnt = fun.iter(metrics.collect()):filter(function(x) return x.metric_name:find('tnt_vinyl') end):length() - t.assert_equals(metrics_cnt, 20) + t.assert_equals(metrics_cnt, 21) end From fcbe67bf9882425ebfb152363e64344ef3f51795 Mon Sep 17 00:00:00 2001 From: Igor Zolotarev Date: Fri, 18 Feb 2022 13:47:01 +0300 Subject: [PATCH 02/10] Fixes after review --- CHANGELOG.md | 3 +-- doc/monitoring/metrics_reference.rst | 11 +++++------ metrics/tarantool/info.lua | 8 ++++---- metrics/tarantool/vinyl.lua | 6 ++++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f692f99..1195fc47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,8 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `tnt_cpu_number` (same as `tnt_cpu_count`) - `tnt_cpu_time` (same as `tnt_cpu_total`) - `tnt_vinyl_scheduler_dump_total` (same as `tnt_vinyl_scheduler_dump_count`) - - `tnt_replication_upstream__lag` (same as `tnt_replication__lag`) - - `tnt_replication_downstream__lag` + - `tnt_replication_lag` - `tnt_vinyl_regulator_blocked_writers` - `tnt_net_requests_in_progress_total` - `tnt_net_requests_in_progress_current` diff --git a/doc/monitoring/metrics_reference.rst b/doc/monitoring/metrics_reference.rst index a319e38b..df5d5932 100644 --- a/doc/monitoring/metrics_reference.rst +++ b/doc/monitoring/metrics_reference.rst @@ -346,12 +346,11 @@ Learn more about :ref:`replication in Tarantool `. * - ``tnt_replication_replica__lsn`` / ``tnt_replication_master__lsn`` - LSN of the master/replica, where ``id`` is the instance's number in the replica set. - * - ``tnt_replication_upstream__lag`` - - Replication upstream lag value in seconds, where - ``id`` is the instance's number in the replica set. - * - ``tnt_replication_downstream__lag`` - - Replication downstream lag value in seconds, where - ``id`` is the instance's number in the replica set. + * - ``tnt_replication_lag`` + - Replication lag value in seconds. + This metric always has labels ``{id="id", stream="stream"}``, + where ``id`` is the instance's number in the replica set, + ``stream`` is ``downstream`` or ``upstream``. .. _metrics-reference-runtime: diff --git a/metrics/tarantool/info.lua b/metrics/tarantool/info.lua index 06e6f499..1c955c80 100644 --- a/metrics/tarantool/info.lua +++ b/metrics/tarantool/info.lua @@ -26,14 +26,14 @@ local function update_info_metrics() local metric_name_old = 'replication_' .. k .. '_lag' collectors_list[metric_name_old] = utils.set_gauge(metric_name_old, 'Replication lag for instance ' .. k, v.upstream.lag) - local metric_name = 'replication_upstream_' .. k .. '_lag' + local metric_name = 'replication_lag' collectors_list[metric_name] = - utils.set_gauge(metric_name, 'Replication upstream lag for instance ' .. k, v.upstream.lag) + utils.set_gauge(metric_name, 'Replication lag', v.upstream.lag, {stream = 'upstream', id = k}) end if v.downstream ~= nil then - local metric_name = 'replication_downstream' .. k .. '_lag' + local metric_name = 'replication_lag' collectors_list[metric_name] = - utils.set_gauge(metric_name, 'Replication downstream lag for instance ' .. k, v.downstream.lag) + utils.set_gauge(metric_name, 'Replication lag', v.downstream.lag, {stream = 'downstream', id = k}) end end diff --git a/metrics/tarantool/vinyl.lua b/metrics/tarantool/vinyl.lua index f12e24e9..8ac00102 100644 --- a/metrics/tarantool/vinyl.lua +++ b/metrics/tarantool/vinyl.lua @@ -24,9 +24,11 @@ local function update() collectors_list.vinyl_regulator_dump_watermark = utils.set_gauge('vinyl_regulator_dump_watermark', 'Point when dumping must occur', vinyl_stat.regulator.dump_watermark) - collectors_list.vinyl_regulator_blocked_writers = - utils.set_gauge('vinyl_regulator_blocked_writers', 'The number of fibers that are blocked waiting ' .. + if vinyl_stat.regulator.blocked_writers ~= nil then + collectors_list.vinyl_regulator_blocked_writers = + utils.set_gauge('vinyl_regulator_blocked_writers', 'The number of fibers that are blocked waiting ' .. 'for Vinyl level0 memory quota', vinyl_stat.regulator.blocked_writers) + end collectors_list.vinyl_tx_conflict = From 364f14311da364603b86c9405760f17cb4b4561e Mon Sep 17 00:00:00 2001 From: Igor Zolotarev Date: Fri, 18 Feb 2022 13:53:22 +0300 Subject: [PATCH 03/10] Clear code --- metrics/tarantool/info.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/metrics/tarantool/info.lua b/metrics/tarantool/info.lua index 1c955c80..63e3c9b2 100644 --- a/metrics/tarantool/info.lua +++ b/metrics/tarantool/info.lua @@ -26,14 +26,12 @@ local function update_info_metrics() local metric_name_old = 'replication_' .. k .. '_lag' collectors_list[metric_name_old] = utils.set_gauge(metric_name_old, 'Replication lag for instance ' .. k, v.upstream.lag) - local metric_name = 'replication_lag' - collectors_list[metric_name] = - utils.set_gauge(metric_name, 'Replication lag', v.upstream.lag, {stream = 'upstream', id = k}) + collectors_list.replication_lag = + utils.set_gauge('replication_lag', 'Replication lag', v.upstream.lag, {stream = 'upstream', id = k}) end if v.downstream ~= nil then - local metric_name = 'replication_lag' - collectors_list[metric_name] = - utils.set_gauge(metric_name, 'Replication lag', v.downstream.lag, {stream = 'downstream', id = k}) + collectors_list.replication_lag = + utils.set_gauge('replication_lag', 'Replication lag', v.downstream.lag, {stream = 'downstream', id = k}) end end From 43102edb43141008d5039042566af129889d05a8 Mon Sep 17 00:00:00 2001 From: Igor Zolotarev Date: Fri, 18 Feb 2022 14:01:04 +0300 Subject: [PATCH 04/10] Add replication_lsn metric --- CHANGELOG.md | 3 +++ doc/monitoring/metrics_reference.rst | 8 +++++--- metrics/tarantool/replicas.lua | 9 +++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1195fc47..cfe2fa8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `tnt_net_requests_in_progress_current` - `tnt_net_requests_in_stream_total` - `tnt_net_requests_in_stream_current` + - `replication_lsn` ### Deprecated @@ -50,6 +51,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `tnt_cpu_total` - `tnt_vinyl_scheduler_dump_count` - `tnt_replication__lag` + - `replication_master__lsn` + - `replication_replica__lsn` ## [0.12.0] - 2021-11-18 ### Changed diff --git a/doc/monitoring/metrics_reference.rst b/doc/monitoring/metrics_reference.rst index df5d5932..3f50ac71 100644 --- a/doc/monitoring/metrics_reference.rst +++ b/doc/monitoring/metrics_reference.rst @@ -343,9 +343,11 @@ Learn more about :ref:`replication in Tarantool `. - LSN number in vclock. This metric always has the label ``{id="id"}``, where ``id`` is the instance's number in the replica set. - * - ``tnt_replication_replica__lsn`` / ``tnt_replication_master__lsn`` - - LSN of the master/replica, where - ``id`` is the instance's number in the replica set. + * - ``tnt_replication_lsn`` + - LSN of the tarantool instance. + This metric always has labels ``{id="id", type="type"}``, where + ``id`` is the instance's number in the replica set, + ``type`` is ``master`` or ``replica``. * - ``tnt_replication_lag`` - Replication lag value in seconds. This metric always has labels ``{id="id", stream="stream"}``, diff --git a/metrics/tarantool/replicas.lua b/metrics/tarantool/replicas.lua index 4c79e3cf..a0c0d20a 100644 --- a/metrics/tarantool/replicas.lua +++ b/metrics/tarantool/replicas.lua @@ -16,6 +16,9 @@ local function update_replicas_metrics() local lsn = replication_info.lsn local metric_name = 'replication_replica_' .. k .. '_lsn' collectors_list[metric_name] = utils.set_gauge(metric_name, 'lsn for replica ' .. k, lsn - v) + + collectors_list.replication_lsn = + utils.set_gauge('replication_lsn', 'lsn for instance', lsn - v, {type = 'replica', id = k}) end end else @@ -29,6 +32,12 @@ local function update_replicas_metrics() 'lsn for master ' .. k, current_box_info.lsn - lsn ) + collectors_list.replication_lsn = utils.set_gauge( + 'replication_lsn', + 'lsn for instance', + current_box_info.lsn - lsn, + {type = 'master', id = k} + ) end end end From 2716b0ebffc2ee0715dc9cad55653c93f4b9ef1e Mon Sep 17 00:00:00 2001 From: Igor Zolotarev Date: Fri, 18 Feb 2022 14:17:53 +0300 Subject: [PATCH 05/10] fix test --- test/tarantool/vinyl_test.lua | 6 +++++- test/utils.lua | 13 +++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/test/tarantool/vinyl_test.lua b/test/tarantool/vinyl_test.lua index 915ecfbc..05d4d7e6 100644 --- a/test/tarantool/vinyl_test.lua +++ b/test/tarantool/vinyl_test.lua @@ -26,5 +26,9 @@ g.test_vinyl_metrics_present = function() local metrics_cnt = fun.iter(metrics.collect()):filter(function(x) return x.metric_name:find('tnt_vinyl') end):length() - t.assert_equals(metrics_cnt, 21) + if utils.is_version_less(_TARANTOOL, '2.10.0') then + t.assert_equals(metrics_cnt, 20) + else + t.assert_equals(metrics_cnt, 21) + end end diff --git a/test/utils.lua b/test/utils.lua index 3cafdd4e..421a98c6 100644 --- a/test/utils.lua +++ b/test/utils.lua @@ -62,9 +62,14 @@ function utils.find_metric(metric_name, metrics_data) return #m > 0 and m or nil end + +local function to_number_multiple(...) + return unpack(fun.map(tonumber, {...}):totable()) +end + function utils.is_version_less(ver_str, reference_ver_str) - local major, minor, patch = string.match(ver_str, '^(%d+).(%d+).(%d+)') - local ref_major, ref_minor, ref_patch = string.match(reference_ver_str, '^(%d+).(%d+).(%d+)') + local major, minor, patch = to_number_multiple(string.match(ver_str, '^(%d+).(%d+).(%d+)')) + local ref_major, ref_minor, ref_patch = to_number_multiple(string.match(reference_ver_str, '^(%d+).(%d+).(%d+)')) if ( major < ref_major ) or ( major == ref_major and minor < ref_minor) or ( major == ref_major and minor == ref_minor and patch < ref_patch) then @@ -75,8 +80,8 @@ function utils.is_version_less(ver_str, reference_ver_str) end function utils.is_version_greater(ver_str, reference_ver_str) - local major, minor, patch = string.match(ver_str, '^(%d+).(%d+).(%d+)') - local ref_major, ref_minor, ref_patch = string.match(reference_ver_str, '^(%d+).(%d+).(%d+)') + local major, minor, patch = to_number_multiple(string.match(ver_str, '^(%d+).(%d+).(%d+)')) + local ref_major, ref_minor, ref_patch = to_number_multiple(string.match(reference_ver_str, '^(%d+).(%d+).(%d+)')) if ( major > ref_major ) or ( major == ref_major and minor > ref_minor) or ( major == ref_major and minor == ref_minor and patch > ref_patch) then From 8700e660303d8d23ec4d17f5c58d3759d78fdb93 Mon Sep 17 00:00:00 2001 From: Igor Zolotarev Date: Fri, 18 Feb 2022 14:27:04 +0300 Subject: [PATCH 06/10] Add deprecation log --- CHANGELOG.md | 4 ++-- metrics/init.lua | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cfe2fa8e..d6c589ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,8 +51,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `tnt_cpu_total` - `tnt_vinyl_scheduler_dump_count` - `tnt_replication__lag` - - `replication_master__lsn` - - `replication_replica__lsn` + - `tnt_replication_master__lsn` + - `tnt_replication_replica__lsn` ## [0.12.0] - 2021-11-18 ### Changed diff --git a/metrics/init.lua b/metrics/init.lua index da1c9072..980d75dc 100644 --- a/metrics/init.lua +++ b/metrics/init.lua @@ -126,7 +126,8 @@ return { enable_default_metrics = function(include, exclude) log.warn('metrics tnt_net_sent_rps, tnt_net_received_rps, tnt_net_connections_rps, '.. 'tnt_net_requests_rps, tnt_stats_op_rps, tnt_space_count, tnt_fiber_count, ' .. - 'lj_gc_total, tnt_cpu_count, tnt_cpu_total, tnt_vinyl_scheduler_dump_count ' .. + 'lj_gc_total, tnt_cpu_count, tnt_cpu_total, tnt_vinyl_scheduler_dump_count, ' .. + 'tnt_replication__lag, tnt_replication_master/replica__lsn ' .. 'are deprecated and will be removed in next releases.') require('metrics.tarantool').enable(include, exclude) end, From 8104f9dcc29d212d193daf572b702c0b77895749 Mon Sep 17 00:00:00 2001 From: Igor Zolotarev Date: Fri, 18 Feb 2022 14:38:30 +0300 Subject: [PATCH 07/10] Fix test (2) --- .github/workflows/test.yml | 1 + test/tarantool/vinyl_test.lua | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0c62d715..3376f0ab 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,6 +18,7 @@ jobs: - "2.5" - "2.6" - "2.7" + - "2.8" cartridge: [ "", "1.2.0", "2.1.2", "2.4.0", "2.5.1", "2.6.0", "2.7.3" ] runs-on: ubuntu-latest steps: diff --git a/test/tarantool/vinyl_test.lua b/test/tarantool/vinyl_test.lua index 05d4d7e6..c428bacb 100644 --- a/test/tarantool/vinyl_test.lua +++ b/test/tarantool/vinyl_test.lua @@ -26,7 +26,8 @@ g.test_vinyl_metrics_present = function() local metrics_cnt = fun.iter(metrics.collect()):filter(function(x) return x.metric_name:find('tnt_vinyl') end):length() - if utils.is_version_less(_TARANTOOL, '2.10.0') then + if utils.is_version_less(_TARANTOOL, '2.8.3') + and utils.is_version_greater(_TARANTOOL, '2.0.0') then t.assert_equals(metrics_cnt, 20) else t.assert_equals(metrics_cnt, 21) From dfd32c419c537efed1714929cca87fb136eb1c14 Mon Sep 17 00:00:00 2001 From: Igor Zolotarev Date: Fri, 18 Feb 2022 16:32:01 +0300 Subject: [PATCH 08/10] Fix after review --- .github/workflows/test.yml | 8 ++++++++ test/utils.lua | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3376f0ab..f0d312b5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,15 +19,23 @@ jobs: - "2.6" - "2.7" - "2.8" + - "2.x-latest" cartridge: [ "", "1.2.0", "2.1.2", "2.4.0", "2.5.1", "2.6.0", "2.7.3" ] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - uses: tarantool/setup-tarantool@v1 + if: matrix.tarantool != '2.x-latest' with: tarantool-version: ${{ matrix.tarantool }} + - name: Install latest pre-release Tarantool 2.x + if: matrix.tarantool == '2.x-latest' + run: | + curl -L https://tarantool.io/pre-release/2/installer.sh | bash + sudo apt-get -y install tarantool + - name: lint run: make lint env: diff --git a/test/utils.lua b/test/utils.lua index 421a98c6..ca884d2b 100644 --- a/test/utils.lua +++ b/test/utils.lua @@ -62,7 +62,6 @@ function utils.find_metric(metric_name, metrics_data) return #m > 0 and m or nil end - local function to_number_multiple(...) return unpack(fun.map(tonumber, {...}):totable()) end From 9cc8b3d1a14160ac08a63964b574d329aec608fc Mon Sep 17 00:00:00 2001 From: Igor Zolotarev Date: Fri, 18 Feb 2022 16:55:47 +0300 Subject: [PATCH 09/10] Fix CI --- .github/workflows/test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f0d312b5..438da486 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,8 +19,12 @@ jobs: - "2.6" - "2.7" - "2.8" - - "2.x-latest" cartridge: [ "", "1.2.0", "2.1.2", "2.4.0", "2.5.1", "2.6.0", "2.7.3" ] + include: + - tarantool: "2.x-latest" + cartridge: "2.7.3" + - tarantool: "2.x-latest" + cartridge: "" runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From 00032b94a252fb4d18f30e86152a070a28415716 Mon Sep 17 00:00:00 2001 From: Igor Zolotarev Date: Mon, 21 Feb 2022 17:34:10 +0300 Subject: [PATCH 10/10] Fix \n and prefix --- CHANGELOG.md | 2 +- metrics/tarantool/vinyl.lua | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6c589ad..eb032316 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,7 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `tnt_net_requests_in_progress_current` - `tnt_net_requests_in_stream_total` - `tnt_net_requests_in_stream_current` - - `replication_lsn` + - `tnt_replication_lsn` ### Deprecated diff --git a/metrics/tarantool/vinyl.lua b/metrics/tarantool/vinyl.lua index 8ac00102..b7f7cdc0 100644 --- a/metrics/tarantool/vinyl.lua +++ b/metrics/tarantool/vinyl.lua @@ -30,7 +30,6 @@ local function update() 'for Vinyl level0 memory quota', vinyl_stat.regulator.blocked_writers) end - collectors_list.vinyl_tx_conflict = utils.set_gauge('vinyl_tx_conflict', 'Count of transaction conflicts', vinyl_stat.tx.conflict) collectors_list.vinyl_tx_commit =