diff --git a/CHANGELOG-3.6.md b/CHANGELOG-3.6.md index 36d0f7fa6..a0e98aa91 100644 --- a/CHANGELOG-3.6.md +++ b/CHANGELOG-3.6.md @@ -21,3 +21,5 @@ See [code changes](https://github.com/etcd-io/etcd/compare/v3.5.0...v3.6.0). - Package `mvcc` was moved to `storage/mvcc` - Package `mvcc/backend` was moved to `storage/backend` - Package `mvcc/buckets` was moved to `storage/schema` +- Package `wal` was moved to `storage/wal` +- Package `datadir` was moved to `storage/datadir` diff --git a/contrib/raftexample/raft.go b/contrib/raftexample/raft.go index b2bcb2562..439a08375 100644 --- a/contrib/raftexample/raft.go +++ b/contrib/raftexample/raft.go @@ -31,8 +31,8 @@ import ( "go.etcd.io/etcd/server/v3/etcdserver/api/rafthttp" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" stats "go.etcd.io/etcd/server/v3/etcdserver/api/v2stats" - "go.etcd.io/etcd/server/v3/wal" - "go.etcd.io/etcd/server/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/storage/wal" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.uber.org/zap" ) diff --git a/etcdutl/etcdutl/backup_command.go b/etcdutl/etcdutl/backup_command.go index bf8ede334..54fa68e1d 100644 --- a/etcdutl/etcdutl/backup_command.go +++ b/etcdutl/etcdutl/backup_command.go @@ -27,15 +27,15 @@ import ( "go.etcd.io/etcd/pkg/v3/idutil" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/server/v3/datadir" "go.etcd.io/etcd/server/v3/etcdserver/api/membership" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" "go.etcd.io/etcd/server/v3/etcdserver/api/v2store" "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/datadir" "go.etcd.io/etcd/server/v3/storage/schema" + "go.etcd.io/etcd/server/v3/storage/wal" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/etcd/server/v3/verify" - "go.etcd.io/etcd/server/v3/wal" - "go.etcd.io/etcd/server/v3/wal/walpb" bolt "go.etcd.io/bbolt" "go.uber.org/zap" diff --git a/etcdutl/etcdutl/defrag_command.go b/etcdutl/etcdutl/defrag_command.go index 67880c0c2..fe4f8430d 100644 --- a/etcdutl/etcdutl/defrag_command.go +++ b/etcdutl/etcdutl/defrag_command.go @@ -21,8 +21,8 @@ import ( "github.com/spf13/cobra" "go.etcd.io/etcd/pkg/v3/cobrautl" - "go.etcd.io/etcd/server/v3/datadir" "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/datadir" ) var ( diff --git a/etcdutl/etcdutl/snapshot_command.go b/etcdutl/etcdutl/snapshot_command.go index 0ff618339..1b3f5ef6b 100644 --- a/etcdutl/etcdutl/snapshot_command.go +++ b/etcdutl/etcdutl/snapshot_command.go @@ -20,7 +20,7 @@ import ( "go.etcd.io/etcd/etcdutl/v3/snapshot" "go.etcd.io/etcd/pkg/v3/cobrautl" - "go.etcd.io/etcd/server/v3/datadir" + "go.etcd.io/etcd/server/v3/storage/datadir" "github.com/spf13/cobra" ) diff --git a/etcdutl/snapshot/v3_snapshot.go b/etcdutl/snapshot/v3_snapshot.go index 36fc9ee8c..f6445498c 100644 --- a/etcdutl/snapshot/v3_snapshot.go +++ b/etcdutl/snapshot/v3_snapshot.go @@ -42,9 +42,9 @@ import ( "go.etcd.io/etcd/server/v3/etcdserver/cindex" "go.etcd.io/etcd/server/v3/storage/backend" "go.etcd.io/etcd/server/v3/storage/schema" + "go.etcd.io/etcd/server/v3/storage/wal" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.etcd.io/etcd/server/v3/verify" - "go.etcd.io/etcd/server/v3/wal" - "go.etcd.io/etcd/server/v3/wal/walpb" "go.uber.org/zap" ) diff --git a/server/config/config.go b/server/config/config.go index 9a8a6881f..c9e7d3aa3 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -25,7 +25,7 @@ import ( "go.etcd.io/etcd/client/pkg/v3/transport" "go.etcd.io/etcd/client/pkg/v3/types" "go.etcd.io/etcd/pkg/v3/netutil" - "go.etcd.io/etcd/server/v3/datadir" + "go.etcd.io/etcd/server/v3/storage/datadir" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" bolt "go.etcd.io/bbolt" diff --git a/server/embed/util.go b/server/embed/util.go index ad4615345..269fbc80b 100644 --- a/server/embed/util.go +++ b/server/embed/util.go @@ -17,7 +17,7 @@ package embed import ( "path/filepath" - "go.etcd.io/etcd/server/v3/wal" + "go.etcd.io/etcd/server/v3/storage/wal" ) func isMemberInitialized(cfg *Config) bool { diff --git a/server/etcdserver/api/snap/snapshotter.go b/server/etcdserver/api/snap/snapshotter.go index 52cc0ae26..70e946d56 100644 --- a/server/etcdserver/api/snap/snapshotter.go +++ b/server/etcdserver/api/snap/snapshotter.go @@ -31,7 +31,7 @@ import ( "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/snap/snappb" - "go.etcd.io/etcd/server/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.uber.org/zap" ) diff --git a/server/etcdserver/api/snap/snapshotter_test.go b/server/etcdserver/api/snap/snapshotter_test.go index 40ad084dd..52a378dc7 100644 --- a/server/etcdserver/api/snap/snapshotter_test.go +++ b/server/etcdserver/api/snap/snapshotter_test.go @@ -25,7 +25,7 @@ import ( "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/server/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.uber.org/zap" ) diff --git a/server/etcdserver/bootstrap.go b/server/etcdserver/bootstrap.go index 497d06ac1..14e1b28d1 100644 --- a/server/etcdserver/bootstrap.go +++ b/server/etcdserver/bootstrap.go @@ -43,8 +43,8 @@ import ( "go.etcd.io/etcd/server/v3/etcdserver/cindex" "go.etcd.io/etcd/server/v3/storage/backend" "go.etcd.io/etcd/server/v3/storage/schema" - "go.etcd.io/etcd/server/v3/wal" - "go.etcd.io/etcd/server/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/storage/wal" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" ) func bootstrap(cfg config.ServerConfig) (b *bootstrappedServer, err error) { diff --git a/server/etcdserver/storage.go b/server/etcdserver/storage.go index 24e0c6d54..8170c29db 100644 --- a/server/etcdserver/storage.go +++ b/server/etcdserver/storage.go @@ -17,8 +17,8 @@ package etcdserver import ( "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" - "go.etcd.io/etcd/server/v3/wal" - "go.etcd.io/etcd/server/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/storage/wal" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" ) type Storage interface { diff --git a/server/datadir/datadir.go b/server/storage/datadir/datadir.go similarity index 100% rename from server/datadir/datadir.go rename to server/storage/datadir/datadir.go diff --git a/server/datadir/datadir_test.go b/server/storage/datadir/datadir_test.go similarity index 94% rename from server/datadir/datadir_test.go rename to server/storage/datadir/datadir_test.go index f6fe19b1c..3933839c3 100644 --- a/server/datadir/datadir_test.go +++ b/server/storage/datadir/datadir_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.etcd.io/etcd/server/v3/datadir" + "go.etcd.io/etcd/server/v3/storage/datadir" ) func TestToBackendFileName(t *testing.T) { diff --git a/server/datadir/doc.go b/server/storage/datadir/doc.go similarity index 100% rename from server/datadir/doc.go rename to server/storage/datadir/doc.go diff --git a/server/wal/decoder.go b/server/storage/wal/decoder.go similarity index 99% rename from server/wal/decoder.go rename to server/storage/wal/decoder.go index 0251a7213..7cc634a2e 100644 --- a/server/wal/decoder.go +++ b/server/storage/wal/decoder.go @@ -24,7 +24,7 @@ import ( "go.etcd.io/etcd/pkg/v3/crc" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/server/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" ) const minSectorSize = 512 diff --git a/server/wal/doc.go b/server/storage/wal/doc.go similarity index 100% rename from server/wal/doc.go rename to server/storage/wal/doc.go diff --git a/server/wal/encoder.go b/server/storage/wal/encoder.go similarity index 98% rename from server/wal/encoder.go rename to server/storage/wal/encoder.go index 61b4c20ef..d9e221ff2 100644 --- a/server/wal/encoder.go +++ b/server/storage/wal/encoder.go @@ -23,7 +23,7 @@ import ( "go.etcd.io/etcd/pkg/v3/crc" "go.etcd.io/etcd/pkg/v3/ioutil" - "go.etcd.io/etcd/server/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" ) // walPageBytes is the alignment for flushing records to the backing Writer. diff --git a/server/wal/file_pipeline.go b/server/storage/wal/file_pipeline.go similarity index 100% rename from server/wal/file_pipeline.go rename to server/storage/wal/file_pipeline.go diff --git a/server/wal/file_pipeline_test.go b/server/storage/wal/file_pipeline_test.go similarity index 100% rename from server/wal/file_pipeline_test.go rename to server/storage/wal/file_pipeline_test.go diff --git a/server/wal/metrics.go b/server/storage/wal/metrics.go similarity index 100% rename from server/wal/metrics.go rename to server/storage/wal/metrics.go diff --git a/server/wal/record_test.go b/server/storage/wal/record_test.go similarity index 98% rename from server/wal/record_test.go rename to server/storage/wal/record_test.go index d28807ebb..1de390dd8 100644 --- a/server/wal/record_test.go +++ b/server/storage/wal/record_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "go.etcd.io/etcd/server/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" ) var ( diff --git a/server/wal/repair.go b/server/storage/wal/repair.go similarity index 98% rename from server/wal/repair.go rename to server/storage/wal/repair.go index 122ee49a6..b6b9b49f2 100644 --- a/server/wal/repair.go +++ b/server/storage/wal/repair.go @@ -21,7 +21,7 @@ import ( "time" "go.etcd.io/etcd/client/pkg/v3/fileutil" - "go.etcd.io/etcd/server/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.uber.org/zap" ) diff --git a/server/wal/repair_test.go b/server/storage/wal/repair_test.go similarity index 99% rename from server/wal/repair_test.go rename to server/storage/wal/repair_test.go index e2e3294ac..089d5a770 100644 --- a/server/wal/repair_test.go +++ b/server/storage/wal/repair_test.go @@ -22,7 +22,7 @@ import ( "testing" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/server/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.uber.org/zap" ) diff --git a/server/wal/util.go b/server/storage/wal/util.go similarity index 100% rename from server/wal/util.go rename to server/storage/wal/util.go diff --git a/server/wal/wal.go b/server/storage/wal/wal.go similarity index 99% rename from server/wal/wal.go rename to server/storage/wal/wal.go index 3c940e0cd..83c10d46f 100644 --- a/server/wal/wal.go +++ b/server/storage/wal/wal.go @@ -30,7 +30,7 @@ import ( "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/raft/v3" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/server/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.uber.org/zap" ) diff --git a/server/wal/wal_bench_test.go b/server/storage/wal/wal_bench_test.go similarity index 100% rename from server/wal/wal_bench_test.go rename to server/storage/wal/wal_bench_test.go diff --git a/server/wal/wal_test.go b/server/storage/wal/wal_test.go similarity index 99% rename from server/wal/wal_test.go rename to server/storage/wal/wal_test.go index 05014086c..d20d561c7 100644 --- a/server/wal/wal_test.go +++ b/server/storage/wal/wal_test.go @@ -31,7 +31,7 @@ import ( "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/server/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.uber.org/zap/zaptest" "go.uber.org/zap" diff --git a/server/wal/walpb/record.go b/server/storage/wal/walpb/record.go similarity index 100% rename from server/wal/walpb/record.go rename to server/storage/wal/walpb/record.go diff --git a/server/wal/walpb/record.pb.go b/server/storage/wal/walpb/record.pb.go similarity index 100% rename from server/wal/walpb/record.pb.go rename to server/storage/wal/walpb/record.pb.go diff --git a/server/wal/walpb/record.proto b/server/storage/wal/walpb/record.proto similarity index 100% rename from server/wal/walpb/record.proto rename to server/storage/wal/walpb/record.proto diff --git a/server/wal/walpb/record_test.go b/server/storage/wal/walpb/record_test.go similarity index 100% rename from server/wal/walpb/record_test.go rename to server/storage/wal/walpb/record_test.go diff --git a/server/verify/verify.go b/server/verify/verify.go index fe34f7a2c..f1de10b5d 100644 --- a/server/verify/verify.go +++ b/server/verify/verify.go @@ -19,11 +19,11 @@ import ( "os" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/server/v3/datadir" "go.etcd.io/etcd/server/v3/storage/backend" + "go.etcd.io/etcd/server/v3/storage/datadir" "go.etcd.io/etcd/server/v3/storage/schema" - wal2 "go.etcd.io/etcd/server/v3/wal" - "go.etcd.io/etcd/server/v3/wal/walpb" + wal2 "go.etcd.io/etcd/server/v3/storage/wal" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.uber.org/zap" ) diff --git a/tests/e2e/etcd_corrupt_test.go b/tests/e2e/etcd_corrupt_test.go index edc95c010..0fd7be373 100644 --- a/tests/e2e/etcd_corrupt_test.go +++ b/tests/e2e/etcd_corrupt_test.go @@ -25,7 +25,7 @@ import ( bolt "go.etcd.io/bbolt" "go.etcd.io/etcd/api/v3/mvccpb" "go.etcd.io/etcd/client/v3" - "go.etcd.io/etcd/server/v3/datadir" + "go.etcd.io/etcd/server/v3/storage/datadir" ) // TODO: test with embedded etcd in integration package diff --git a/tools/etcd-dump-logs/etcd-dump-log_test.go b/tools/etcd-dump-logs/etcd-dump-log_test.go index 372f7597b..e78e89627 100644 --- a/tools/etcd-dump-logs/etcd-dump-log_test.go +++ b/tools/etcd-dump-logs/etcd-dump-log_test.go @@ -29,7 +29,7 @@ import ( "go.etcd.io/etcd/client/pkg/v3/fileutil" "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/raft/v3/raftpb" - "go.etcd.io/etcd/server/v3/wal" + "go.etcd.io/etcd/server/v3/storage/wal" "go.uber.org/zap" ) diff --git a/tools/etcd-dump-logs/main.go b/tools/etcd-dump-logs/main.go index b56356344..15c76a40a 100644 --- a/tools/etcd-dump-logs/main.go +++ b/tools/etcd-dump-logs/main.go @@ -34,8 +34,8 @@ import ( "go.etcd.io/etcd/pkg/v3/pbutil" "go.etcd.io/etcd/raft/v3/raftpb" "go.etcd.io/etcd/server/v3/etcdserver/api/snap" - "go.etcd.io/etcd/server/v3/wal" - "go.etcd.io/etcd/server/v3/wal/walpb" + "go.etcd.io/etcd/server/v3/storage/wal" + "go.etcd.io/etcd/server/v3/storage/wal/walpb" "go.uber.org/zap" )