Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,968 Commits 15 Branches 491 Tags 148 MiB
Commit Graph

63 Commits

Author SHA1 Message Date
Gyuho Lee
a8e1cf0433 client: rename "master" branch references to "main" 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
 2021-05-12 10:38:50 -07:00
Piotr Tabor
a78d072b9a Simplify KVstore dependency on cindex. 2021-05-04 18:21:24 +02:00
Piotr Tabor
911204cd76 Fix ETCDCTL_API=2 etcdctl backup --with-v3 consistent index consistency 
Prior to this CL, `ETCDCTL_API=2 etcdctl backup --with-v3` was readacting WAL log
(by removal of some entries), but was NOT updating consistent_index in the backend.
Also the WAL editing logic was buggy, as it didn't took in consideration the fact
that when TERM changes, there can be entries with duplicated indexes in
the log. So its NOT sufficient to subtract number of removed entries to
get accurate log indexes.

The PR replaces removing and shifting of WAL entries with replacing them with an no-op entries.
Thanks to this consistent-index references are staying up to date.

The PR also:
  - updates 'verification' logic to check whether consistent_index does not lag befor last snapshot
  - env-gated execution of verification framework in `etcdctl backup`.

Tested with:
```
(./build.sh && cd tests && EXPECT_DEBUG=TRUE 'env' 'go' 'test' '-timeout=300m' 'go.etcd.io/etcd/tests/v3/e2e' -run=TestCtlV2Backup --count=1000 2>&1 | tee TestCtlV2BackupV3.log)
```
 2021-04-29 11:51:24 +02:00
Piotr Tabor
adc365e14f etcdctl2: backup command logging cleanup (zap) 2021-04-28 23:26:17 +02:00
Piotr Tabor
7107cb9f86 fixup! Create 'datadir' package responsible for paths. 2021-04-28 08:44:06 +02:00
Piotr Tabor
6f8f506cf4 Create 'datadir' package responsible for paths. 2021-04-28 07:56:13 +02:00
Piotr Tabor
067521981e v2 etcdctl backup: producing consistent state of membership 2021-04-27 19:34:34 +02:00
Piotr Tabor
768da490ed 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.
 2021-04-27 17:17:30 +02:00
Piotr Tabor
931af493cf Merge pull request #12830 from ptabor/20210405-split-pkg 
Split client/pkg as dedicated low-dependencies module for client
 2021-04-08 01:12:17 +02:00
Piotr Tabor
3bb7acc8cf Migrate dependencies pkg/foo -> client/pkg/foo 2021-04-07 00:38:47 +02:00
Piotr Tabor
4d4c84e014 server: Written Snapshot's to WAL contains populated ConfState. 
This will (among others) allow etcd-3.6 to not depend on store_v2 .snap files at all,
as WAL + db file will be self-sufficient.
 2021-03-25 00:31:44 +01:00
wpedrak
2c2456bf3d *: partial staticcheck fix 2021-03-10 14:13:38 +00:00
Piotr Tabor
aaf423e962 server: Update imports. 
find -name '*.go' | xargs sed -i --follow-symlinks 's|etcd/v3/|etcd/server/v3/|g'
 2020-10-26 13:02:32 +01:00
Piotr Tabor
e62417297d *: Rename of imports of raft (as its now a module) 
% find -name '*.go' -o -name '*.md' -o -name '*.sh' | xargs sed -i --follow-symlinks 's|etcd/v3/raft|etcd/raft/v3|g'
 2020-10-16 13:58:18 +02:00
Piotr Tabor
45e4306508 client: Move client to client/v2 as a module. 
We make v2 client code a module go.etcd.io/etcd/client/v2.

Pretty mechanical change that can be summarized as:

  mkdir client/v2
  cd client/v2 && git mod init go.etcd.io/etcd/client/v2

  git mv client/*.go client/v2/
  find -name '*.go' | xargs sed -i --follow-symlinks 's|/v3/client["]|/client/v2\"|g'

  + fixing changelog, bom, go.mod etc.
 2020-10-15 14:39:43 +02:00
Piotr Tabor
de55bb6331 pkg: Rename imports after making 'pkg' a module 
find -name '*.go' | xargs sed --follow-symlinks -i 's|go.etcd.io/etcd/v3/pkg/|go.etcd.io/etcd/pkg/v3/|g'
go fmt ./...
 2020-10-13 00:09:27 +02:00
Piotr Tabor
28f2b07623 *: Update references to code moved to the api/ dir. 
Follow up to file-moves done in the previous commit.

The commit contains purely mechanical consequences of execution (apart
of scripts/genproto.sh):

  % find ./ -name '*.go'  | xargs sed --follow-symlinks -i 's|v3/etcdserver/api/v3rpc/rpctypes|v3/api/v3rpc/rpctypes|g'
  % find ./ -name '*.go'  | xargs sed --follow-symlinks -i 's|v3/version|v3/api/version|g'
  % find ./ -name '*.go'  | xargs sed --follow-symlinks -i 's|v3/mvcc/mvccpb|v3/api/mvccpb|g'
  % find ./ -name '*.go'  | xargs sed --follow-symlinks -i 's|v3/etcdserver/etcdserverpb|v3/api/etcdserverpb|g'
  % find ./ -name '*.go'  | xargs sed --follow-symlinks -i 's|v3/etcdserver/api/membership/membershippb|v3/api/membershippb|g'
  % find ./ -name '*.go'  | xargs sed --follow-symlinks -i 's|v3/auth/authpb|v3/api/authpb|g'

  % find ./ -name '*.proto' -o -name '*.md'  | xargs -L 1 sed --follow-symlinks -i 's|/mvcc/mvccpb/kv.proto|/api/mvccpb/kv.proto|g'
  % find ./ -name '*.proto' -o -name '*.md'  | xargs -L 1 sed --follow-symlinks -i 's|/auth/authpb/auth.proto|/api/authpb/auth.proto|g'
  % find ./ -name '*.proto' -o -name '*.md'  | xargs -L 1 sed --follow-symlinks -i 's|/etcdserver/api/membership/membershippb/membership.proto|/api/membershippb/membership.proto|g'

  I also modified manually paths in scripts/genproto.sh.

  % go fmt ./...
 2020-10-06 11:56:16 +02:00
Brandon Philips
96cce208c2 go.mod: use go.etcd.io/etcd/v3 versioning 
This change makes the etcd package compatible with the existing Go
ecosystem for module versioning.

Used this tool to update package imports:
  https://github.com/KSubedi/gomove
 2020-04-28 00:57:35 +00:00
Sahdev P. Zala
acb33a5f3f etcdctl: use appropriate type conversion 
index variable is being passed as uint64 so we shouldn't use Int.
Also the if loop is redundant so remove it.
 2020-02-08 22:01:20 -05:00
Gyuho Lee
34bd797e67 *: revert module import paths 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
 2019-05-28 15:39:35 -07:00
shivaramr
9150bf52d6 go modules: Fix module path version to include version number 2019-04-26 15:29:50 -07:00
Iskander Sharipov
48a2442fd7 etcdctl: fix strings.HasPrefix args order 
Signed-off-by: Iskander Sharipov <quasilyte@gmail.com>
 2019-02-02 02:39:27 +03:00
Shin'ya Ueoka
aa4313a55a *: fix github links 2018-11-10 11:14:18 +09:00
Sam Batschelet
fa35126ef8
*: add client support for discovery-srv-name 
Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
 2018-11-09 10:13:04 -05:00
Gyuho Lee
8db439d693 *: use "go.etcd.io/bbolt" 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
 2018-08-29 12:31:28 -07:00
Gyuho Lee
0ef9ef3c74 *: rerun "gofmt" 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
 2018-08-28 18:25:39 -07:00
Gyuho Lee
d37f1521b7 *: update import paths to "go.etcd.io/etcd" 
Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
 2018-08-28 17:47:55 -07:00
Iskander Sharipov
3da90b6d3e etcdctl/ctlv2/command: fix type switch case order 
Since syscall.Errno implements net.Error and all cases
are matched sequentially, it's a mistake to put syscall.Errno
case after net.Error since it will never be executed.

This change swaps syscall.Errno case with net.Error
to give that clause chance to execute.
 2018-07-28 23:33:13 +03:00
Gyuho Lee
9149565cb3 *: move to "etcdserver/api/membership" 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
 2018-05-21 10:31:16 -07:00
Gyuho Lee
4d80753804 etcdctl: rename internal snapshot packages 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
 2018-05-21 07:45:34 -07:00
Gyuho Lee
6dbce6b9a4 clientv3,etcdctl: support structured logger 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
 2018-04-16 17:36:00 -07:00
Gyuho Lee
aece63b10e etcdctl: use "TrustedCAFile" 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
 2018-03-20 15:31:32 -07:00
Gyuho Lee
9b5d6edc4b *: revert "internal/raftsnap" 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
 2018-02-26 17:11:40 -08:00
Gyuho Lee
c0910085f5 ctlv2: fix govet -shadow warning 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
 2018-02-21 10:20:54 -08:00
Gyuho Lee
dee39bf786 internal/raftsnap: move "raftsnap" to internal 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
 2018-01-24 10:36:04 -08:00
Gyuho Lee
2b6fd3094f *: rename "snap" to "raftsnap" package 
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
 2018-01-24 10:26:07 -08:00
Gyu-Ho Lee
f65aee0759 *: replace 'golang.org/x/net/context' with 'context' 
Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
 2017-09-07 13:39:42 -07:00
Anthony Romano
9f7375c225 ctlv2: save v3 db with v2 data using --with-v3 
Also strips out v3 data if not given --with-v3.
 2017-08-31 22:57:41 -07:00
Anthony Romano
ad0b3cfdab ctlv2: report unhealthy in cluster-health if any node is unavailable 
Fixes #8061 and #7032
 2017-06-09 10:57:17 -07:00
Anthony Romano
2f1542c06d *: use filepath.Join for files 2017-03-16 07:46:06 -07:00
Gyu-Ho Lee
3d75395875 *: remove never-unused vars, minor lint fix 
Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
 2017-03-06 14:59:12 -08:00
Anthony Romano
5559a026d7 etcdctl: remove GetUser check before mutable commands 
etcdctl was checking if the user exists before applying mutable calls;
if etcdctl contacts a minority member, the member may not know the user
exists on the cluster yet, causing command failure when it should succeed.

If the user does not exist, it will be picked up once the command goes
through raft.

Fixes #6932
 2016-12-05 12:12:06 -08:00
Gyu-Ho Lee
9b470ef4c0 etcdctl/ctlv2: error handling with JSON 2016-11-01 20:59:13 -07:00
joshrosso
e489229153 etcdctl: add ttl unit to flag description 
Add the ttl unit (seconds) to --ttl description for etcdctl's mk, mkdir, set,
setdir, update, and updatedir commands.
 2016-10-25 17:12:15 -07:00
Anthony Romano
e218834b58 etcdctl: set ServerName for TLS when using --discovery-srv 2016-08-03 22:28:03 -07:00
jesse.millan
205f10aeb6 etcdctl: Add support for formating output of key related commands 
All v2 key and dir related commands will now honor the global format option if
it was specified. Otherwise, the output will remain the same.
 2016-07-27 14:17:19 -07:00
jesse.millan
f18d5433cc etcdctl: Add support for formating output of ls command in json 
The ls command will check for and honor json or extended output formats.

Fixes #5993
 2016-07-20 18:05:23 -07:00
Anthony Romano
97ff1abb3e etcdctl: remove 0.4 import command 2016-07-13 15:30:37 -07:00
Anthony Romano
439b96f090 etcdctl: remove 0.4 peer syncing 2016-07-13 15:26:25 -07:00
Danny Sauer
a998fb4af1 etcdctl: index is incremented in Watcher; remove double-increment 2016-06-23 08:54:34 -05:00