From 7b3a84e2a396ea10f1aef1570857bf162119e22d Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Wed, 22 Aug 2018 00:19:03 +0200 Subject: [PATCH] move replication package to project root (independent of cmd package) --- cmd/config_job_local.go | 2 +- cmd/config_job_pull.go | 2 +- cmd/replication.go | 4 ++-- {cmd/replication => replication}/context.go | 2 +- {cmd/replication => replication}/fsrep/fsfsm.go | 2 +- {cmd/replication => replication}/fsrep/state_string.go | 0 .../replication => replication}/fsrep/stepstate_string.go | 0 {cmd/replication => replication}/internal/diff/diff.go | 2 +- {cmd/replication => replication}/internal/queue/queue.go | 2 +- {cmd/replication => replication}/mainfsm.go | 8 ++++---- {cmd/replication => replication}/pdu/pdu.pb.go | 0 {cmd/replication => replication}/pdu/pdu.proto | 0 {cmd/replication => replication}/pdu/pdu_extras.go | 0 {cmd/replication => replication}/pdu/pdu_test.go | 0 {cmd/replication => replication}/state_string.go | 0 15 files changed, 12 insertions(+), 12 deletions(-) rename {cmd/replication => replication}/context.go (90%) rename {cmd/replication => replication}/fsrep/fsfsm.go (99%) rename {cmd/replication => replication}/fsrep/state_string.go (100%) rename {cmd/replication => replication}/fsrep/stepstate_string.go (100%) rename {cmd/replication => replication}/internal/diff/diff.go (98%) rename {cmd/replication => replication}/internal/queue/queue.go (98%) rename {cmd/replication => replication}/mainfsm.go (97%) rename {cmd/replication => replication}/pdu/pdu.pb.go (100%) rename {cmd/replication => replication}/pdu/pdu.proto (100%) rename {cmd/replication => replication}/pdu/pdu_extras.go (100%) rename {cmd/replication => replication}/pdu/pdu_test.go (100%) rename {cmd/replication => replication}/state_string.go (100%) diff --git a/cmd/config_job_local.go b/cmd/config_job_local.go index 21fd6a6..4755beb 100644 --- a/cmd/config_job_local.go +++ b/cmd/config_job_local.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" "github.com/zrepl/zrepl/zfs" "sync" - "github.com/zrepl/zrepl/cmd/replication" + "github.com/zrepl/zrepl/replication" ) type LocalJob struct { diff --git a/cmd/config_job_pull.go b/cmd/config_job_pull.go index fe65d4f..a54fd8d 100644 --- a/cmd/config_job_pull.go +++ b/cmd/config_job_pull.go @@ -13,7 +13,7 @@ import ( "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/problame/go-streamrpc" - "github.com/zrepl/zrepl/cmd/replication" + "github.com/zrepl/zrepl/replication" ) type PullJob struct { diff --git a/cmd/replication.go b/cmd/replication.go index 0e1cc8a..11c6abe 100644 --- a/cmd/replication.go +++ b/cmd/replication.go @@ -2,7 +2,7 @@ package cmd import ( "fmt" - "github.com/zrepl/zrepl/cmd/replication/pdu" + "github.com/zrepl/zrepl/replication/pdu" "github.com/problame/go-streamrpc" "github.com/zrepl/zrepl/zfs" "io" @@ -10,7 +10,7 @@ import ( "github.com/golang/protobuf/proto" "bytes" "context" - "github.com/zrepl/zrepl/cmd/replication" + "github.com/zrepl/zrepl/replication" ) type InitialReplPolicy string diff --git a/cmd/replication/context.go b/replication/context.go similarity index 90% rename from cmd/replication/context.go rename to replication/context.go index 775ee24..7b4b0e9 100644 --- a/cmd/replication/context.go +++ b/replication/context.go @@ -3,7 +3,7 @@ package replication import ( "github.com/zrepl/zrepl/logger" "context" - "github.com/zrepl/zrepl/cmd/replication/fsrep" + "github.com/zrepl/zrepl/replication/fsrep" ) type contextKey int diff --git a/cmd/replication/fsrep/fsfsm.go b/replication/fsrep/fsfsm.go similarity index 99% rename from cmd/replication/fsrep/fsfsm.go rename to replication/fsrep/fsfsm.go index d70b84b..d07fd3d 100644 --- a/cmd/replication/fsrep/fsfsm.go +++ b/replication/fsrep/fsfsm.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/zrepl/zrepl/cmd/replication/pdu" + "github.com/zrepl/zrepl/replication/pdu" "github.com/zrepl/zrepl/logger" ) diff --git a/cmd/replication/fsrep/state_string.go b/replication/fsrep/state_string.go similarity index 100% rename from cmd/replication/fsrep/state_string.go rename to replication/fsrep/state_string.go diff --git a/cmd/replication/fsrep/stepstate_string.go b/replication/fsrep/stepstate_string.go similarity index 100% rename from cmd/replication/fsrep/stepstate_string.go rename to replication/fsrep/stepstate_string.go diff --git a/cmd/replication/internal/diff/diff.go b/replication/internal/diff/diff.go similarity index 98% rename from cmd/replication/internal/diff/diff.go rename to replication/internal/diff/diff.go index f1f4af6..fed2392 100644 --- a/cmd/replication/internal/diff/diff.go +++ b/replication/internal/diff/diff.go @@ -3,7 +3,7 @@ package mainfsm import ( "sort" - . "github.com/zrepl/zrepl/cmd/replication/pdu" + . "github.com/zrepl/zrepl/replication/pdu" ) type ConflictNoCommonAncestor struct { diff --git a/cmd/replication/internal/queue/queue.go b/replication/internal/queue/queue.go similarity index 98% rename from cmd/replication/internal/queue/queue.go rename to replication/internal/queue/queue.go index 6f7496c..a187026 100644 --- a/cmd/replication/internal/queue/queue.go +++ b/replication/internal/queue/queue.go @@ -4,7 +4,7 @@ import ( "time" "sort" - . "github.com/zrepl/zrepl/cmd/replication/fsrep" + . "github.com/zrepl/zrepl/replication/fsrep" ) type replicationQueueItem struct { diff --git a/cmd/replication/mainfsm.go b/replication/mainfsm.go similarity index 97% rename from cmd/replication/mainfsm.go rename to replication/mainfsm.go index d9d6c83..ea1308f 100644 --- a/cmd/replication/mainfsm.go +++ b/replication/mainfsm.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "github.com/zrepl/zrepl/cmd/replication/pdu" - "github.com/zrepl/zrepl/cmd/replication/fsrep" - . "github.com/zrepl/zrepl/cmd/replication/internal/queue" - . "github.com/zrepl/zrepl/cmd/replication/internal/diff" + "github.com/zrepl/zrepl/replication/pdu" + "github.com/zrepl/zrepl/replication/fsrep" + . "github.com/zrepl/zrepl/replication/internal/queue" + . "github.com/zrepl/zrepl/replication/internal/diff" ) //go:generate stringer -type=State diff --git a/cmd/replication/pdu/pdu.pb.go b/replication/pdu/pdu.pb.go similarity index 100% rename from cmd/replication/pdu/pdu.pb.go rename to replication/pdu/pdu.pb.go diff --git a/cmd/replication/pdu/pdu.proto b/replication/pdu/pdu.proto similarity index 100% rename from cmd/replication/pdu/pdu.proto rename to replication/pdu/pdu.proto diff --git a/cmd/replication/pdu/pdu_extras.go b/replication/pdu/pdu_extras.go similarity index 100% rename from cmd/replication/pdu/pdu_extras.go rename to replication/pdu/pdu_extras.go diff --git a/cmd/replication/pdu/pdu_test.go b/replication/pdu/pdu_test.go similarity index 100% rename from cmd/replication/pdu/pdu_test.go rename to replication/pdu/pdu_test.go diff --git a/cmd/replication/state_string.go b/replication/state_string.go similarity index 100% rename from cmd/replication/state_string.go rename to replication/state_string.go