Start redis (#470)
* Start miniredis, repairer, and checker with captplanet
This commit is contained in:
parent
0e7f6358fb
commit
3e1b16ea99
@ -10,6 +10,7 @@ import (
|
|||||||
|
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
|
"github.com/alicebob/miniredis"
|
||||||
"storj.io/storj/pkg/auth/grpcauth"
|
"storj.io/storj/pkg/auth/grpcauth"
|
||||||
"storj.io/storj/pkg/cfgstruct"
|
"storj.io/storj/pkg/cfgstruct"
|
||||||
"storj.io/storj/pkg/datarepair/checker"
|
"storj.io/storj/pkg/datarepair/checker"
|
||||||
@ -114,11 +115,29 @@ func cmdRun(cmd *cobra.Command, args []string) (err error) {
|
|||||||
grpcauth.NewAPIKeyInterceptor(),
|
grpcauth.NewAPIKeyInterceptor(),
|
||||||
runCfg.Satellite.PointerDB,
|
runCfg.Satellite.PointerDB,
|
||||||
runCfg.Satellite.Kademlia,
|
runCfg.Satellite.Kademlia,
|
||||||
// runCfg.Satellite.Checker,
|
o,
|
||||||
// runCfg.Satellite.Repairer,
|
)
|
||||||
o)
|
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
// start Repair
|
||||||
|
m := miniredis.NewMiniRedis()
|
||||||
|
m.RequireAuth("abc123")
|
||||||
|
|
||||||
|
if err = m.StartAddr(":6378"); err != nil {
|
||||||
|
errch <- err
|
||||||
|
} else {
|
||||||
|
defer m.Close()
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
errch <- runCfg.Satellite.Checker.Run(ctx, nil)
|
||||||
|
}()
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
errch <- runCfg.Satellite.Repairer.Run(ctx, nil)
|
||||||
|
}()
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
// start s3 uplink
|
// start s3 uplink
|
||||||
go func() {
|
go func() {
|
||||||
_, _ = fmt.Printf("Starting s3-gateway on %s\nAccess key: %s\nSecret key: %s\n",
|
_, _ = fmt.Printf("Starting s3-gateway on %s\nAccess key: %s\nSecret key: %s\n",
|
||||||
|
@ -112,8 +112,9 @@ func cmdSetup(cmd *cobra.Command, args []string) (err error) {
|
|||||||
startingPort := setupCfg.StartingPort
|
startingPort := setupCfg.StartingPort
|
||||||
|
|
||||||
overrides := map[string]interface{}{
|
overrides := map[string]interface{}{
|
||||||
"satellite.identity.cert-path": setupCfg.HCIdentity.CertPath,
|
"satellite.repairer.queue-address": "redis://127.0.0.1:6378?db=1&password=abc123",
|
||||||
"satellite.identity.key-path": setupCfg.HCIdentity.KeyPath,
|
"satellite.identity.cert-path": setupCfg.HCIdentity.CertPath,
|
||||||
|
"satellite.identity.key-path": setupCfg.HCIdentity.KeyPath,
|
||||||
"satellite.identity.address": joinHostPort(
|
"satellite.identity.address": joinHostPort(
|
||||||
setupCfg.ListenHost, startingPort+1),
|
setupCfg.ListenHost, startingPort+1),
|
||||||
"satellite.kademlia.todo-listen-addr": joinHostPort(
|
"satellite.kademlia.todo-listen-addr": joinHostPort(
|
||||||
|
@ -14,7 +14,7 @@ import (
|
|||||||
|
|
||||||
// Config contains configurable values for repairer
|
// Config contains configurable values for repairer
|
||||||
type Config struct {
|
type Config struct {
|
||||||
QueueAddress string `help:"data repair queue address" default:"redis://localhost:6379?db=5&password=123"`
|
QueueAddress string `help:"data repair queue address" default:"redis://localhost:6379?db=0&password=testpass"`
|
||||||
MaxRepair int `help:"maximum segments that can be repaired concurrently" default:"100"`
|
MaxRepair int `help:"maximum segments that can be repaired concurrently" default:"100"`
|
||||||
Interval time.Duration `help:"how frequently checker should audit segments" default:"3600s"`
|
Interval time.Duration `help:"how frequently checker should audit segments" default:"3600s"`
|
||||||
}
|
}
|
||||||
|
@ -9,6 +9,8 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"go.uber.org/zap"
|
||||||
|
|
||||||
q "storj.io/storj/pkg/datarepair/queue"
|
q "storj.io/storj/pkg/datarepair/queue"
|
||||||
"storj.io/storj/pkg/pb"
|
"storj.io/storj/pkg/pb"
|
||||||
"storj.io/storj/pkg/utils"
|
"storj.io/storj/pkg/utils"
|
||||||
@ -36,6 +38,8 @@ type repairer struct {
|
|||||||
|
|
||||||
// Run the repairer loop
|
// Run the repairer loop
|
||||||
func (r *repairer) Run() (err error) {
|
func (r *repairer) Run() (err error) {
|
||||||
|
zap.S().Info("Repairer is starting up")
|
||||||
|
|
||||||
c := make(chan *pb.InjuredSegment)
|
c := make(chan *pb.InjuredSegment)
|
||||||
|
|
||||||
ticker := time.NewTicker(r.interval)
|
ticker := time.NewTicker(r.interval)
|
||||||
|
Loading…
Reference in New Issue
Block a user