From d772aef9a744040e8372e812164b734b45e8f650 Mon Sep 17 00:00:00 2001 From: Vladimir Davydov <vdavydov@tarantool.org> Date: Wed, 27 Apr 2022 14:49:58 +0300 Subject: [PATCH] errinj: add SPACE_UPGRADE_DELAY error injection It will be used to stall background space upgrade in tests. While we are at it, move ERRINJ_TX_DELAY_PRIO_ENDPOINT to restore the sorted order of the error injection list. Follow-up commit 38b25832f9fb ("box: add space upgrade stubs"). NO_DOC=internal NO_TEST=internal NO_CHANGELOG=internal --- src/lib/core/errinj.h | 3 ++- test/box/errinj.result | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/core/errinj.h b/src/lib/core/errinj.h index 770c062a67..ca09bc0550 100644 --- a/src/lib/core/errinj.h +++ b/src/lib/core/errinj.h @@ -118,6 +118,7 @@ struct errinj { _(ERRINJ_SNAP_COMMIT_DELAY, ERRINJ_BOOL, {.bparam = false}) \ _(ERRINJ_SNAP_COMMIT_FAIL, ERRINJ_BOOL, {.bparam = false}) \ _(ERRINJ_SNAP_WRITE_DELAY, ERRINJ_BOOL, {.bparam = false}) \ + _(ERRINJ_SPACE_UPGRADE_DELAY, ERRINJ_BOOL, {.bparam = false}) \ _(ERRINJ_SQL_NAME_NORMALIZATION, ERRINJ_BOOL, {.bparam = false}) \ _(ERRINJ_STDIN_ISATTY, ERRINJ_INT, {.iparam = -1}) \ _(ERRINJ_SWIM_FD_ONLY, ERRINJ_BOOL, {.bparam = false}) \ @@ -126,6 +127,7 @@ struct errinj { _(ERRINJ_TUPLE_FIELD, ERRINJ_BOOL, {.bparam = false}) \ _(ERRINJ_TUPLE_FIELD_COUNT_LIMIT, ERRINJ_INT, {.iparam = -1}) \ _(ERRINJ_TUPLE_FORMAT_COUNT, ERRINJ_INT, {.iparam = -1}) \ + _(ERRINJ_TX_DELAY_PRIO_ENDPOINT, ERRINJ_DOUBLE, {.dparam = 0}) \ _(ERRINJ_TXN_COMMIT_ASYNC, ERRINJ_BOOL, {.bparam = false})\ _(ERRINJ_VYRUN_DATA_READ, ERRINJ_BOOL, {.bparam = false}) \ _(ERRINJ_VY_COMPACTION_DELAY, ERRINJ_BOOL, {.bparam = false}) \ @@ -170,7 +172,6 @@ struct errinj { _(ERRINJ_XLOG_META, ERRINJ_BOOL, {.bparam = false}) \ _(ERRINJ_XLOG_READ, ERRINJ_INT, {.iparam = -1}) \ _(ERRINJ_XLOG_RENAME_DELAY, ERRINJ_BOOL, {.bparam = false}) \ - _(ERRINJ_TX_DELAY_PRIO_ENDPOINT, ERRINJ_DOUBLE, {.dparam = 0}) \ ENUM0(errinj_id, ERRINJ_LIST); extern struct errinj errinjs[]; diff --git a/test/box/errinj.result b/test/box/errinj.result index 664b6851ff..8f976c214c 100644 --- a/test/box/errinj.result +++ b/test/box/errinj.result @@ -92,6 +92,7 @@ evals - ERRINJ_SNAP_COMMIT_DELAY: false - ERRINJ_SNAP_COMMIT_FAIL: false - ERRINJ_SNAP_WRITE_DELAY: false + - ERRINJ_SPACE_UPGRADE_DELAY: false - ERRINJ_SQL_NAME_NORMALIZATION: false - ERRINJ_STDIN_ISATTY: -1 - ERRINJ_SWIM_FD_ONLY: false -- GitLab