Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(no)StoreV2 (Part 2): Prepare to read membership information from backend #12820

Merged
merged 6 commits into from
Apr 28, 2021
Merged

(no)StoreV2 (Part 2): Prepare to read membership information from backend #12820

merged 6 commits into from
Apr 28, 2021

Commits on Apr 27, 2021

  1. sever: v2store deprecation: Fix etcdctl snapshot restore to restore 

    correct 'backend' (bbolt) context in aspect of membership.

Prior to this change the 'restored' backend used to still contain:
  - old memberid (mvcc deletion used, why the membership is in bolt
bucket, but not mvcc part):
    ```
	mvs := mvcc.NewStore(s.lg, be, lessor, ci, mvcc.StoreConfig{CompactionBatchLimit: math.MaxInt32})
	defer mvs.Close()
	txn := mvs.Write(traceutil.TODO())
	btx := be.BatchTx()
	del := func(k, v []byte) error {
		txn.DeleteRange(k, nil)
		return nil
	}

	// delete stored members from old cluster since using new members
	btx.UnsafeForEach([]byte("members"), del)
    ```
  - didn't get new members added.
    @ptabor
    ptabor committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    768da49 View commit details
    Browse the repository at this point in the history

  2. etcd-dump-logs: Print full confState as json for debugging purposes.

    @ptabor
    ptabor committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    aa65973 View commit details
    Browse the repository at this point in the history

  3. Membership: Add additional methods to trim/manage membership data in … 

    …backend.
    @ptabor
    ptabor committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    7ae3d25 View commit details
    Browse the repository at this point in the history

  4. e2e tests: More logging and expect adopted to 3.4.

    @ptabor
    ptabor committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    4725567 View commit details
    Browse the repository at this point in the history

  5. Simplify membership interface: Does not pass the 'unused' token.

    @ptabor
    ptabor committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    a70386a View commit details
    Browse the repository at this point in the history

  6. v2 etcdctl backup: producing consistent state of membership

    @ptabor
    ptabor committed Apr 27, 2021
    Configuration menu
    Copy the full SHA
    0675219 View commit details
    Browse the repository at this point in the history