openstack
/
swift
Code Issues Proposed changes

Merge "Better error messages in go/probe" into feature/hummingbird

This commit is contained in:
Jenkins 2016-11-15 19:42:58 +00:00 committed by Gerrit Code Review
parent 44ba11504e 2fdd2c480e
commit 1835450bff
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go/objectserver/replicator.go
View File

@ -936,7 +936,7 @@ func NewReplicator(serverconf hummingbird.Config, flags *flag.FlagSet) (hummingb
continue
}
if replicator.Rings[policy.Index], err = hummingbird.GetRing("object", hashPathPrefix, hashPathSuffix, policy.Index); err != nil {
return nil, fmt.Errorf("Unable to load ring.")
return nil, fmt.Errorf("Unable to load ring for Policy %d.", policy.Index)
}
}
if replicator.logger, err = hummingbird.SetupLogger(serverconf, flags, "app:object-replicator", "object-replicator"); err != nil {

12
go/probe/base.go
View File

@ -20,6 +20,7 @@ import (
"flag"
"fmt"
"io/ioutil"
"log"
"net"
"net/http"
"net/http/httptest"
@ -180,6 +181,7 @@ func (e *Environment) ObjExists(server int, timestamp string, policy int) bool {
// NewEnvironment creates a new environment. Arguments should be a series of key, value pairs that are added to the object server configuration file.
func NewEnvironment(settings ...string) *Environment {
log.SetFlags(log.LstdFlags | log.Lshortfile)
oldLoadPolicies := hummingbird.LoadPolicies
hummingbird.LoadPolicies = func() hummingbird.PolicyList {
return hummingbird.PolicyList(map[int]*hummingbird.Policy{
@ -234,13 +236,19 @@ func NewEnvironment(settings ...string) *Environment {
_, _, server, _, _ := objectserver.GetServer(conf, &flag.FlagSet{})
ts.Config.Handler = server.GetHandler(conf)
replicator, _ := objectserver.NewReplicator(conf, &flag.FlagSet{})
replicator, err := objectserver.NewReplicator(conf, &flag.FlagSet{})
if err != nil {
log.Fatal(err)
}
replicator.(*objectserver.Replicator).Rings[0] = env.ring
replicator.(*objectserver.Replicator).Rings[1] = env.ring
trs.Config.Handler = replicator.(*objectserver.Replicator).GetHandler()
replicatorServer := &TestReplicatorWebServer{Server: trs, host: host, port: port, root: driveRoot, replicator: replicator.(*objectserver.Replicator)}
auditor, _ := objectserver.NewAuditor(conf, &flag.FlagSet{})
auditor, err := objectserver.NewAuditor(conf, &flag.FlagSet{})
if err != nil {
log.Fatal(err)
}
env.ring.(*FakeRing).devices = append(env.ring.(*FakeRing).devices, &hummingbird.Device{
Id: i, Device: "sda", Ip: host, Port: port, Region: 0, ReplicationIp: trsHost, ReplicationPort: trsPort, Weight: 1, Zone: i,