[errors] de-specialize Transient in favor of Tags.

logdog/server/archivist/archivist.go

 // Copyright 2016 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package archivist
 
 import (
         "bytes"
         "encoding/hex"
         "fmt"
         "io"
         "time"
 
         "github.com/golang/protobuf/proto"
         "golang.org/x/net/context"
 
         "github.com/luci/luci-go/common/clock"
         "github.com/luci/luci-go/common/errors"
         "github.com/luci/luci-go/common/gcloud/gs"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/proto/google"
+        "github.com/luci/luci-go/common/retry/transient"
         "github.com/luci/luci-go/common/sync/parallel"
         "github.com/luci/luci-go/common/tsmon/distribution"
         "github.com/luci/luci-go/common/tsmon/field"
         "github.com/luci/luci-go/common/tsmon/metric"
         tsmon_types "github.com/luci/luci-go/common/tsmon/types"
         "github.com/luci/luci-go/logdog/api/endpoints/coordinator/services/v1"
         "github.com/luci/luci-go/logdog/api/logpb"
         "github.com/luci/luci-go/logdog/common/archive"
         "github.com/luci/luci-go/logdog/common/storage"
         "github.com/luci/luci-go/logdog/common/types"
@@ skipping 305 matching lines @@
         }
 
         // Archive to staging.
         //
         // If a non-transient failure occurs here, we will report it to the Archivist
         // under the assumption that it will continue occurring.
         //
         // We will handle error creating the plan and executing the plan in the same
         // switch statement below.
         switch err = staged.stage(c); {
-        case errors.IsTransient(err):
+        case transient.Tag.In(err):
                 // If this is a transient error, exit immediately and do not delete the
                 // archival task.
                 log.WithError(err).Warningf(c, "TRANSIENT error during archival operation.")
                 return err
 
         case err != nil:
                 // This is a non-transient error, so we are confident that any future
                 // Archival will also encounter this error. We will mark this archival
                 // as an error and report it to the Coordinator.
                 log.WithError(err).Errorf(c, "Archival failed with non-transient error.")
@@ skipping 214 matching lines @@
                 "streamURL": sa.stream.staged,
                 "indexURL":  sa.index.staged,
                 "dataURL":   sa.data.staged,
         }.Debugf(c, "Staging log stream...")
 
         // Group any transient errors that occur during cleanup. If we aren't
         // returning a non-transient error, return a transient "terr".
         var terr errors.MultiError
         defer func() {
                 if err == nil && len(terr) > 0 {
-                        err = errors.WrapTransient(terr)
+                        err = transient.Tag.Apply(terr)
                 }
         }()
 
         // Close our writers on exit. If any of them fail to close, mark the archival
         // as a transient failure.
         closeWriter := func(closer io.Closer, path gs.Path) {
                 // Close the Writer. If this results in an error, append it to our transient
                 // error MultiError.
                 if ierr := closer.Close(); ierr != nil {
                         terr = append(terr, ierr)
@@ skipping 206 matching lines @@
         return e.inner
 }
 
 func isFailure(err error) bool {
         if err == nil {
                 return false
         }
         _, ok := err.(*statusErrorWrapper)
         return !ok
 }