cmd/swarm/swarm-smoke: renamed track-timeout and track-chunks

This commit is contained in:
Fabio Barone 2019-02-17 19:49:45 -05:00
parent dcdff86b8e
commit 71382131df
2 changed files with 15 additions and 15 deletions

View file

@ -37,16 +37,16 @@ var (
) )
var ( var (
allhosts string allhosts string
hosts []string hosts []string
filesize int filesize int
syncDelay int syncDelay int
httpPort int httpPort int
wsPort int wsPort int
verbosity int verbosity int
timeout int timeout int
single bool single bool
getAllRefsTimeout int trackTimeout int
) )
func main() { func main() {
@ -104,10 +104,10 @@ func main() {
Destination: &single, Destination: &single,
}, },
cli.IntFlag{ cli.IntFlag{
Name: "refs-timeout", Name: "track-timeout",
Value: 5, Value: 5,
Usage: "timeout in seconds to wait for GetAllReferences to return", Usage: "timeout in seconds to wait for GetAllReferences to return",
Destination: &getAllRefsTimeout, Destination: &trackTimeout,
}, },
} }

View file

@ -57,7 +57,7 @@ func uploadAndSyncCmd(ctx *cli.Context, tuid string) error {
e := fmt.Errorf("timeout after %v sec", timeout) e := fmt.Errorf("timeout after %v sec", timeout)
// trigger debug functionality on randomBytes // trigger debug functionality on randomBytes
err := triggerChunkDebug(randomBytes[:]) err := trackChunks(randomBytes[:])
if err != nil { if err != nil {
e = fmt.Errorf("%v; triggerChunkDebug failed: %v", e, err) e = fmt.Errorf("%v; triggerChunkDebug failed: %v", e, err)
} }
@ -66,7 +66,7 @@ func uploadAndSyncCmd(ctx *cli.Context, tuid string) error {
} }
} }
func triggerChunkDebug(testData []byte) error { func trackChunks(testData []byte) error {
log.Warn("Test timed out; running chunk debug sequence") log.Warn("Test timed out; running chunk debug sequence")
addrs, err := getAllRefs(testData) addrs, err := getAllRefs(testData)
@ -117,7 +117,7 @@ func getAllRefs(testData []byte) (storage.AddressCollection, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
ctx, cancel := context.WithTimeout(context.Background(), time.Duration(getAllRefsTimeout)*time.Second) ctx, cancel := context.WithTimeout(context.Background(), time.Duration(trackTimeout)*time.Second)
defer cancel() defer cancel()
reader := bytes.NewReader(testData) reader := bytes.NewReader(testData)