bc29610124
* Updates Raft library to get new snapshot/restore API. * Basic backup and restore working, but need some cleanup. * Breaks out a snapshot module and adds a SHA256 integrity check. * Adds snapshot ACL and fills in some missing comments. * Require a consistent read for snapshots. * Make sure snapshot works if ACLs aren't enabled. * Adds a bit of package documentation. * Returns an empty response from restore to avoid EOF errors. * Adds API client support for snapshots. * Makes internal file names match on-disk file snapshots. * Adds DC and token coverage for snapshot API test. * Adds missing documentation. * Adds a unit test for the snapshot client endpoint. * Moves the connection pool out of the client for easier testing. * Fixes an incidental issue in the prepared query unit test. I realized I had two servers in bootstrap mode so this wasn't a good setup. * Adds a half close to the TCP stream and fixes panic on error. * Adds client and endpoint tests for snapshots. * Moves the pool back into the snapshot RPC client. * Adds a TLS test and fixes half-closes for TLS connections. * Tweaks some comments. * Adds a low-level snapshot test. This is independent of Consul so we can pull this out into a library later if we want to. * Cleans up snapshot and archive and completes archive tests. * Sends a clear error for snapshot operations in dev mode. Snapshots require the Raft snapshots to be readable, which isn't supported in dev mode. Send a clear error instead of a deep-down Raft one. * Adds docs for the snapshot endpoint. * Adds a stale mode and index feedback for snapshot saves. This gives folks a way to extract data even if the cluster has no leader. * Changes the internal format of a snapshot from zip to tgz. * Pulls in Raft fix to cancel inflight before a restore. * Pulls in new Raft restore interface. * Adds metadata to snapshot saves and a verify function. * Adds basic save and restore snapshot CLI commands. * Gets rid of tarball extensions and adds restore message. * Fixes an incidental bad link in the KV docs. * Adds documentation for the snapshot CLI commands. * Scuttle any request body when a snapshot is saved. * Fixes archive unit test error message check. * Allows for nil output writers in snapshot RPC handlers. * Renames hash list Decode to DecodeAndVerify. * Closes the client connection for snapshot ops. * Lowers timeout for restore ops. * Updates Raft vendor to get new Restore signature and integrates with Consul. * Bounces the leader's internal state when we do a restore.
205 lines
3.9 KiB
Go
205 lines
3.9 KiB
Go
package main
|
|
|
|
import (
|
|
"os"
|
|
"os/signal"
|
|
"syscall"
|
|
|
|
"github.com/hashicorp/consul/command"
|
|
"github.com/hashicorp/consul/command/agent"
|
|
"github.com/mitchellh/cli"
|
|
)
|
|
|
|
// Commands is the mapping of all the available Consul commands.
|
|
var Commands map[string]cli.CommandFactory
|
|
|
|
func init() {
|
|
ui := &cli.BasicUi{Writer: os.Stdout}
|
|
|
|
Commands = map[string]cli.CommandFactory{
|
|
"agent": func() (cli.Command, error) {
|
|
return &agent.Command{
|
|
Revision: GitCommit,
|
|
Version: Version,
|
|
VersionPrerelease: VersionPrerelease,
|
|
HumanVersion: GetHumanVersion(),
|
|
Ui: ui,
|
|
ShutdownCh: make(chan struct{}),
|
|
}, nil
|
|
},
|
|
|
|
"configtest": func() (cli.Command, error) {
|
|
return &command.ConfigTestCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"event": func() (cli.Command, error) {
|
|
return &command.EventCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"exec": func() (cli.Command, error) {
|
|
return &command.ExecCommand{
|
|
ShutdownCh: makeShutdownCh(),
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"force-leave": func() (cli.Command, error) {
|
|
return &command.ForceLeaveCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"kv": func() (cli.Command, error) {
|
|
return &command.KVCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"kv delete": func() (cli.Command, error) {
|
|
return &command.KVDeleteCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"kv get": func() (cli.Command, error) {
|
|
return &command.KVGetCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"kv put": func() (cli.Command, error) {
|
|
return &command.KVPutCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"join": func() (cli.Command, error) {
|
|
return &command.JoinCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"keygen": func() (cli.Command, error) {
|
|
return &command.KeygenCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"keyring": func() (cli.Command, error) {
|
|
return &command.KeyringCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"leave": func() (cli.Command, error) {
|
|
return &command.LeaveCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"lock": func() (cli.Command, error) {
|
|
return &command.LockCommand{
|
|
ShutdownCh: makeShutdownCh(),
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"maint": func() (cli.Command, error) {
|
|
return &command.MaintCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"members": func() (cli.Command, error) {
|
|
return &command.MembersCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"monitor": func() (cli.Command, error) {
|
|
return &command.MonitorCommand{
|
|
ShutdownCh: makeShutdownCh(),
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"operator": func() (cli.Command, error) {
|
|
return &command.OperatorCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"info": func() (cli.Command, error) {
|
|
return &command.InfoCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"reload": func() (cli.Command, error) {
|
|
return &command.ReloadCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"rtt": func() (cli.Command, error) {
|
|
return &command.RTTCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"snapshot": func() (cli.Command, error) {
|
|
return &command.SnapshotCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"snapshot restore": func() (cli.Command, error) {
|
|
return &command.SnapshotRestoreCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"snapshot save": func() (cli.Command, error) {
|
|
return &command.SnapshotSaveCommand{
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"version": func() (cli.Command, error) {
|
|
return &command.VersionCommand{
|
|
HumanVersion: GetHumanVersion(),
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
|
|
"watch": func() (cli.Command, error) {
|
|
return &command.WatchCommand{
|
|
ShutdownCh: makeShutdownCh(),
|
|
Ui: ui,
|
|
}, nil
|
|
},
|
|
}
|
|
}
|
|
|
|
// makeShutdownCh returns a channel that can be used for shutdown
|
|
// notifications for commands. This channel will send a message for every
|
|
// interrupt or SIGTERM received.
|
|
func makeShutdownCh() <-chan struct{} {
|
|
resultCh := make(chan struct{})
|
|
|
|
signalCh := make(chan os.Signal, 4)
|
|
signal.Notify(signalCh, os.Interrupt, syscall.SIGTERM)
|
|
go func() {
|
|
for {
|
|
<-signalCh
|
|
resultCh <- struct{}{}
|
|
}
|
|
}()
|
|
|
|
return resultCh
|
|
}
|