@leoppro, PTAL.

The prompt default to No and ONLY return true if the user input is y or Yes, Ref https://github.com/pingcap/tiup/blob/2f4bdc0bfb5ffc7f0a0425f947c09fa7c9836edb/pkg/cliutil/tui.go#L71-L81

So, IMHO, I don't think we need to add more error messages.

Codecov Report

Merging #1093 (6d978d6) into master (d85cb88) will decrease coverage by 40.18%. The diff coverage is 0.00%.

@@             Coverage Diff             @@
##           master    #1093       +/-   ##
===========================================
- Coverage   56.55%   16.37%   -40.19%     
===========================================
  Files         283      147      -136     
  Lines       19993    11211     -8782     
===========================================
- Hits        11308     1836     -9472     
- Misses       6932     8906     +1974     
+ Partials     1753      469     -1284     

Flags with carried forward coverage won't be shown. Click here to find out more.

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update d85cb88...6d978d6. Read the comment docs.

/run-kafka-tests

/cc @lucklove

[REVIEW NOTIFICATION]

This pull request has not been approved.

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment. After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

<details>

Reviewer can indicate their review by writing /lgtm in a comment. Reviewer can cancel approval by writing /lgtm cancel in a comment. </details>

<!--Review Notification Identifier-->

<!-- Thank you for contributing to TiUP! Please read TiUP's CONTRIBUTING document BEFORE filing this PR. -->

What problem does this PR solve? <!--add issue link with summary if exists-->

Fix #1047

What is changed and how it works?

Check List <!--REMOVE the items that are not applicable-->

Tests <!-- At least one of them must be included. -->

• Unit test
• Integration test
• Manual test (add detailed scripts or steps below)

Manual test as below:

cat << EOF > topo.yml
global:
  user: tidb6wu
  group: pingcap
  deploy_dir: tidb1-deploy
  data_dir: tidb1-data

server_configs:
  tidb:
    binlog.enable: true
    binlog.ignore-error: false
  tikv:
    storage.reserve-space: 1K
  pump:
    storage.stop-write-at-available-space: 1 mib

pd_servers:
  - host: n3
  - host: n4
  - host: n5

tikv_servers:
  - host: n1
    port: 32160
    status_port: 32180
    log_dir: '/home/tidb6wu/tidb1-data/tikv-32160/log'
    data_dir: '/home/tidb6wu/tidb1-data/tikv-32160'
  - host: n2
  - host: n3
  EOF

tiup-cluster deploy c1 v4.0.4 topo.yml

The check will failed of overlapError

Code changes

• Has exported function/method change
• Has exported variable/fields change
• Has interface methods change
• Has persistent data change

Side effects

• Possible performance regression
• Increased code complexity
• Breaking backward compatibility

Related changes

• Need to cherry-pick to the release branch
• Need to update the documentation

Release notes: <!-- If no, just leave the release note block below as is. If yes, a release note is required: Enter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string "action required". Please refer to Release Notes Language Style Guide before writing the release note. -->

NONE

cherry-pick #1319 to release-4.0 You can switch your code base to this Pull Request by using git-extras:

# In ticdc repo:
git pr https://github.com/pingcap/ticdc/pull/1333

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/ticdc.git pr/1333:release-4.0-30fbd24492d9

<!-- Thank you for contributing to TiDB-CDC! Please read MD's CONTRIBUTING document BEFORE filing this PR. -->

What problem does this PR solve? <!--add issue link with summary if exists-->

Improve unit test of kv client, part of #1292

What is changed and how it works?

• Test kv client can handle out of order prewrite and commit before initialized properly
• Test txn heartbeat event, which is a prewrite without value
• Test rollback event

Check List <!--REMOVE the items that are not applicable-->

Tests <!-- At least one of them must be included. -->

• Unit test
• Integration test

Release note

• No release note

@zz-jason, @zhangjinpeng1987, PTAL.

/run-all-tests

/merge

@bb7133, PTAL.

Codecov Report

Merging #1333 (6e4b2e4) into release-4.0 (f28608b) will increase coverage by 0.1071%. The diff coverage is n/a.

@@                 Coverage Diff                 @@
##           release-4.0      #1333        +/-   ##
===================================================
+ Coverage      46.9692%   47.0763%   +0.1071%     
===================================================
  Files              130        130                
  Lines            13066      13066                
===================================================
+ Hits              6137       6151        +14     
+ Misses            6264       6249        -15     
- Partials           665        666         +1     

/run-all-tests

/run-all-tets

/test pull-e2e-kind

Bug Report

<!-- Thanks for your bug report! Don't worry if you can't fill out all the sections. -->

What version of TiKV are you using?

<!-- You can run tikv-server --version -->

[2021/01/23 14:09:28.818 +08:00] [INFO] [lib.rs:92] ["Welcome to TiKV"]
[2021/01/23 14:09:28.819 +08:00] [INFO] [lib.rs:97] ["Release Version:   5.0.0-rc.x"]
[2021/01/23 14:09:28.819 +08:00] [INFO] [lib.rs:97] ["Edition:           Community"]
[2021/01/23 14:09:28.819 +08:00] [INFO] [lib.rs:97] ["Git Commit Hash:   927e36f952f837c25e2eab2aa065a075b5502ad9"]
[2021/01/23 14:09:28.819 +08:00] [INFO] [lib.rs:97] ["Git Commit Branch: master"]
[2021/01/23 14:09:28.819 +08:00] [INFO] [lib.rs:97] ["UTC Build Time:    2021-01-22 11:02:49"]

What operating system and CPU are you using?

<!-- If you're using Linux, you can run cat /proc/cpuinfo -->

Steps to reproduce

<!-- If possible, provide a recipe for reproducing the error. A complete runnable program is good. -->

integration test in TiCDC: ci/job/1920

tikv logs: tikv_logs.zip

What did you expect?

CI runs successfully

What did happened?

[2021/01/23 14:10:10.209 +08:00] [FATAL] [lib.rs:465] ["assertion failed: `(left >= right)`
  left: `TimeStamp(422414173484089357)`,
 right: `TimeStamp(422414175188025351)`"] [backtrace="stack backtrace:
   0: tikv_util::set_panic_hook::{{closure}}
             at components/tikv_util/src/lib.rs:464
   1: std::panicking::rust_panic_with_hook
             at library/std/src/panicking.rs:581
   2: std::panicking::begin_panic_handler::{{closure}}
             at library/std/src/panicking.rs:484
   3: std::sys_common::backtrace::__rust_end_short_backtrace
             at library/std/src/sys_common/backtrace.rs:141
   4: rust_begin_unwind
             at library/std/src/panicking.rs:483
   5: std::panicking::begin_panic_fmt
             at library/std/src/panicking.rs:437
   6: tikv::storage::mvcc::reader::scanner::seek_for_valid_write
             at /home/jenkins/agent/workspace/build_tikv_multi_branch_master/tikv/src/storage/mvcc/reader/scanner/mod.rs:414
      tikv::storage::mvcc::reader::scanner::seek_for_valid_value
             at /home/jenkins/agent/workspace/build_tikv_multi_branch_master/tikv/src/storage/mvcc/reader/scanner/mod.rs:457
   7: <tikv::storage::mvcc::reader::scanner::forward::DeltaEntryPolicy as tikv::storage::mvcc::reader::scanner::forward::ScanPolicy<S>>::handle_lock
             at /home/jenkins/agent/workspace/build_tikv_multi_branch_master/tikv/src/storage/mvcc/reader/scanner/forward.rs:622
      tikv::storage::mvcc::reader::scanner::forward::ForwardScanner<S,P>::read_next
             at /home/jenkins/agent/workspace/build_tikv_multi_branch_master/tikv/src/storage/mvcc/reader/scanner/forward.rs:258
      <tikv::storage::mvcc::reader::scanner::forward::ForwardScanner<S,P> as tikv::storage::txn::store::TxnEntryScanner>::next_entry
             at /home/jenkins/agent/workspace/build_tikv_multi_branch_master/tikv/src/storage/mvcc/reader/scanner/forward.rs:762
      cdc::endpoint::Initializer::scan_batch
             at components/cdc/src/endpoint.rs:1126
   8: cdc::endpoint::Initializer::async_incremental_scan
             at components/cdc/src/endpoint.rs:1077
      cdc::endpoint::Initializer::on_change_cmd
             at components/cdc/src/endpoint.rs:1025
   9: cdc::endpoint::Endpoint<T>::on_register::{{closure}}
             at /home/jenkins/agent/workspace/build_tikv_multi_branch_master/tikv/components/cdc/src/endpoint.rs:563
      <core::future::from_generator::GenFuture<T> as core::future::future::Future>::poll
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/core/src/future/mod.rs:80
  10: tokio::runtime::task::core::Core<T,S>::poll::{{closure}}
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/task/core.rs:173
      tokio::loom::std::unsafe_cell::UnsafeCell<T>::with_mut
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/loom/std/unsafe_cell.rs:14
      tokio::runtime::task::core::Core<T,S>::poll
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/task/core.rs:158
      tokio::runtime::task::harness::Harness<T,S>::poll::{{closure}}
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/task/harness.rs:107
      core::ops::function::FnOnce::call_once
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/core/src/ops/function.rs:227
      <std::panic::AssertUnwindSafe<F> as core::ops::function::FnOnce<()>>::call_once
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/panic.rs:308
      std::panicking::try::do_call
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/panicking.rs:381
      std::panicking::try
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/panicking.rs:345
      std::panic::catch_unwind
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/panic.rs:382
      tokio::runtime::task::harness::Harness<T,S>::poll
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/task/harness.rs:89
      tokio::runtime::task::raw::poll
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/task/raw.rs:104
  11: tokio::runtime::task::raw::RawTask::poll
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/task/raw.rs:66
      tokio::runtime::task::Notified<S>::run
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/task/mod.rs:169
      tokio::runtime::thread_pool::worker::Context::run_task::{{closure}}
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/thread_pool/worker.rs:349
      tokio::coop::with_budget::{{closure}}
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/coop.rs:127
      std::thread::local::LocalKey<T>::try_with
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/thread/local.rs:272
      std::thread::local::LocalKey<T>::with
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/thread/local.rs:248
      tokio::coop::with_budget
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/coop.rs:120
      tokio::coop::budget
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/coop.rs:96
      tokio::runtime::thread_pool::worker::Context::run_task
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/thread_pool/worker.rs:348
  12: tokio::runtime::thread_pool::worker::Context::run
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/thread_pool/worker.rs:320
      tokio::runtime::thread_pool::worker::run::{{closure}}
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/thread_pool/worker.rs:305
      tokio::macros::scoped_tls::ScopedKey<T>::set
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/macros/scoped_tls.rs:63
      tokio::runtime::thread_pool::worker::run
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/thread_pool/worker.rs:302
      tokio::runtime::thread_pool::worker::Launch::launch::{{closure}}
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/thread_pool/worker.rs:281
      <tokio::runtime::blocking::task::BlockingTask<T> as core::future::future::Future>::poll
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/blocking/task.rs:41
      tokio::runtime::task::core::Core<T,S>::poll::{{closure}}
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/task/core.rs:173
      tokio::loom::std::unsafe_cell::UnsafeCell<T>::with_mut
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/loom/std/unsafe_cell.rs:14
      tokio::runtime::task::core::Core<T,S>::poll
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/task/core.rs:158
      tokio::runtime::task::harness::Harness<T,S>::poll::{{closure}}
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/task/harness.rs:107
      core::ops::function::FnOnce::call_once
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/core/src/ops/function.rs:227
      <std::panic::AssertUnwindSafe<F> as core::ops::function::FnOnce<()>>::call_once
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/panic.rs:308
      std::panicking::try::do_call
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/panicking.rs:381
      std::panicking::try
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/panicking.rs:345
      std::panic::catch_unwind
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/panic.rs:382
      tokio::runtime::task::harness::Harness<T,S>::poll
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/task/harness.rs:89
      tokio::runtime::task::raw::poll
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/task/raw.rs:104
  13: tokio::runtime::task::raw::RawTask::poll
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/task/raw.rs:66
      tokio::runtime::task::Notified<S>::run
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/task/mod.rs:169
      tokio::runtime::blocking::pool::Inner::run
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/blocking/pool.rs:250
      tokio::runtime::blocking::pool::Spawner::spawn_thread::{{closure}}::{{closure}}
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/blocking/pool.rs:230
      tokio::runtime::context::enter
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/context.rs:72
      tokio::runtime::handle::Handle::enter
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/handle.rs:76
      tokio::runtime::blocking::pool::Spawner::spawn_thread::{{closure}}
             at /rust/registry/src/github.com-1ecc6299db9ec823/tokio-0.2.24/src/runtime/blocking/pool.rs:229
      std::sys_common::backtrace::__rust_begin_short_backtrace
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/sys_common/backtrace.rs:125
  14: std::thread::Builder::spawn_unchecked::{{closure}}::{{closure}}
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/thread/mod.rs:470
      <std::panic::AssertUnwindSafe<F> as core::ops::function::FnOnce<()>>::call_once
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/panic.rs:308
      std::panicking::try::do_call
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/panicking.rs:381
      std::panicking::try
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/panicking.rs:345
      std::panic::catch_unwind
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/panic.rs:382
      std::thread::Builder::spawn_unchecked::{{closure}}
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/std/src/thread/mod.rs:469
      core::ops::function::FnOnce::call_once{{vtable.shim}}
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/core/src/ops/function.rs:227
  15: <alloc::boxed::Box<F> as core::ops::function::FnOnce<A>>::call_once
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/alloc/src/boxed.rs:1042
      <alloc::boxed::Box<F> as core::ops::function::FnOnce<A>>::call_once
             at /rustc/b1496c6e606dd908dd651ac2cce89815e10d7fc5/library/alloc/src/boxed.rs:1042
      std::sys::unix::thread::Thread::new::thread_start
             at library/std/src/sys/unix/thread.rs:89
  16: start_thread
  17: __clone
"] [location=/home/jenkins/agent/workspace/build_tikv_multi_branch_master/tikv/src/storage/mvcc/reader/scanner/mod.rs:414] [thread_name=cdcwkr]

/test pull-e2e-kind

@zhaoxugang You did not submit PR within 7 days, so give up automatically.

cherry pick to release-4.0 in PR #1333

/run-all-tests

cherry-pick #1319 to release-4.0

<!-- Thank you for contributing to TiDB-CDC! Please read MD's CONTRIBUTING document BEFORE filing this PR. -->

What problem does this PR solve? <!--add issue link with summary if exists-->

Improve unit test of kv client, part of #1292

What is changed and how it works?

• Test kv client can handle out of order prewrite and commit before initialized properly
• Test txn heartbeat event, which is a prewrite without value
• Test rollback event

Check List <!--REMOVE the items that are not applicable-->

Tests <!-- At least one of them must be included. -->

• Unit test
• Integration test

Release note

• No release note

agree with it

/run-all-tests

/run-kafka-tests /kafka-version=2.7.0 /kafka-tag=2.13-2.7.0

/run-integration-tests

/run-all-tests