etcdserver: move error to errors.go
Both server.go and cluster.go are using defined ErrX. Move error to errors.gorelease-2.0
parent
2c21ac656b
commit
803c38f448
|
@ -29,7 +29,6 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
|
||||||
etcdErr "github.com/coreos/etcd/error"
|
|
||||||
"github.com/coreos/etcd/pkg/flags"
|
"github.com/coreos/etcd/pkg/flags"
|
||||||
"github.com/coreos/etcd/pkg/types"
|
"github.com/coreos/etcd/pkg/types"
|
||||||
"github.com/coreos/etcd/raft/raftpb"
|
"github.com/coreos/etcd/raft/raftpb"
|
||||||
|
@ -405,8 +404,3 @@ func ValidateClusterAndAssignIDs(local *Cluster, existing *Cluster) error {
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func isKeyNotFound(err error) bool {
|
|
||||||
e, ok := err.(*etcdErr.Error)
|
|
||||||
return ok && e.ErrorCode == etcdErr.EcodeKeyNotFound
|
|
||||||
}
|
|
||||||
|
|
|
@ -0,0 +1,52 @@
|
||||||
|
/*
|
||||||
|
Copyright 2014 CoreOS, Inc.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package etcdserver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
|
||||||
|
etcdErr "github.com/coreos/etcd/error"
|
||||||
|
|
||||||
|
"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
ErrUnknownMethod = errors.New("etcdserver: unknown method")
|
||||||
|
ErrStopped = errors.New("etcdserver: server stopped")
|
||||||
|
ErrIDRemoved = errors.New("etcdserver: ID removed")
|
||||||
|
ErrIDExists = errors.New("etcdserver: ID exists")
|
||||||
|
ErrIDNotFound = errors.New("etcdserver: ID not found")
|
||||||
|
ErrPeerURLexists = errors.New("etcdserver: peerURL exists")
|
||||||
|
ErrCanceled = errors.New("etcdserver: request cancelled")
|
||||||
|
ErrTimeout = errors.New("etcdserver: request timed out")
|
||||||
|
)
|
||||||
|
|
||||||
|
func parseCtxErr(err error) error {
|
||||||
|
switch err {
|
||||||
|
case context.Canceled:
|
||||||
|
return ErrCanceled
|
||||||
|
case context.DeadlineExceeded:
|
||||||
|
return ErrTimeout
|
||||||
|
default:
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func isKeyNotFound(err error) bool {
|
||||||
|
e, ok := err.(*etcdErr.Error)
|
||||||
|
return ok && e.ErrorCode == etcdErr.EcodeKeyNotFound
|
||||||
|
}
|
|
@ -18,7 +18,6 @@ package etcdserver
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"log"
|
"log"
|
||||||
|
@ -31,7 +30,6 @@ import (
|
||||||
"sync/atomic"
|
"sync/atomic"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
|
|
||||||
"github.com/coreos/etcd/discovery"
|
"github.com/coreos/etcd/discovery"
|
||||||
"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
|
"github.com/coreos/etcd/etcdserver/etcdhttp/httptypes"
|
||||||
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
|
||||||
|
@ -48,6 +46,8 @@ import (
|
||||||
"github.com/coreos/etcd/snap"
|
"github.com/coreos/etcd/snap"
|
||||||
"github.com/coreos/etcd/store"
|
"github.com/coreos/etcd/store"
|
||||||
"github.com/coreos/etcd/wal"
|
"github.com/coreos/etcd/wal"
|
||||||
|
|
||||||
|
"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -66,15 +66,6 @@ const (
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrUnknownMethod = errors.New("etcdserver: unknown method")
|
|
||||||
ErrStopped = errors.New("etcdserver: server stopped")
|
|
||||||
ErrIDRemoved = errors.New("etcdserver: ID removed")
|
|
||||||
ErrIDExists = errors.New("etcdserver: ID exists")
|
|
||||||
ErrIDNotFound = errors.New("etcdserver: ID not found")
|
|
||||||
ErrPeerURLexists = errors.New("etcdserver: peerURL exists")
|
|
||||||
ErrCanceled = errors.New("etcdserver: request cancelled")
|
|
||||||
ErrTimeout = errors.New("etcdserver: request timed out")
|
|
||||||
|
|
||||||
storeMembersPrefix = path.Join(StoreAdminPrefix, "members")
|
storeMembersPrefix = path.Join(StoreAdminPrefix, "members")
|
||||||
storeRemovedMembersPrefix = path.Join(StoreAdminPrefix, "removed_members")
|
storeRemovedMembersPrefix = path.Join(StoreAdminPrefix, "removed_members")
|
||||||
|
|
||||||
|
@ -978,14 +969,3 @@ func getOtherPeerURLs(cl ClusterInfo, self string) []string {
|
||||||
sort.Strings(us)
|
sort.Strings(us)
|
||||||
return us
|
return us
|
||||||
}
|
}
|
||||||
|
|
||||||
func parseCtxErr(err error) error {
|
|
||||||
switch err {
|
|
||||||
case context.Canceled:
|
|
||||||
return ErrCanceled
|
|
||||||
case context.DeadlineExceeded:
|
|
||||||
return ErrTimeout
|
|
||||||
default:
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue