mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
7d50dc06a2
Previous implementation watches a single key so there's no way to have separate hosts associate with separate keys for a single grpc target. Instead, accept all keys on a prefix. Also fixes first the Next() to read current name data from etcd instead of waiting for the next event on a synced watcher.
136 lines
3.2 KiB
Go
136 lines
3.2 KiB
Go
// Copyright 2016 The etcd Authors
|
|
//
|
|
// 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 naming
|
|
|
|
import (
|
|
"encoding/json"
|
|
"reflect"
|
|
"testing"
|
|
|
|
"golang.org/x/net/context"
|
|
"google.golang.org/grpc/naming"
|
|
|
|
etcd "github.com/coreos/etcd/clientv3"
|
|
"github.com/coreos/etcd/integration"
|
|
"github.com/coreos/etcd/pkg/testutil"
|
|
)
|
|
|
|
func TestGRPCResolver(t *testing.T) {
|
|
defer testutil.AfterTest(t)
|
|
|
|
clus := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
|
|
defer clus.Terminate(t)
|
|
|
|
r := GRPCResolver{
|
|
Client: clus.RandClient(),
|
|
}
|
|
|
|
w, err := r.Resolve("foo")
|
|
if err != nil {
|
|
t.Fatal("failed to resolve foo", err)
|
|
}
|
|
defer w.Close()
|
|
|
|
addOp := naming.Update{Op: naming.Add, Addr: "127.0.0.1", Metadata: "metadata"}
|
|
err = r.Update(context.TODO(), "foo", addOp)
|
|
if err != nil {
|
|
t.Fatal("failed to add foo", err)
|
|
}
|
|
|
|
us, err := w.Next()
|
|
if err != nil {
|
|
t.Fatal("failed to get udpate", err)
|
|
}
|
|
|
|
wu := &naming.Update{
|
|
Op: naming.Add,
|
|
Addr: "127.0.0.1",
|
|
Metadata: "metadata",
|
|
}
|
|
|
|
if !reflect.DeepEqual(us[0], wu) {
|
|
t.Fatalf("up = %#v, want %#v", us[0], wu)
|
|
}
|
|
|
|
delOp := naming.Update{Op: naming.Delete, Addr: "127.0.0.1"}
|
|
err = r.Update(context.TODO(), "foo", delOp)
|
|
|
|
us, err = w.Next()
|
|
if err != nil {
|
|
t.Fatal("failed to get udpate", err)
|
|
}
|
|
|
|
wu = &naming.Update{
|
|
Op: naming.Delete,
|
|
Addr: "127.0.0.1",
|
|
Metadata: "metadata",
|
|
}
|
|
|
|
if !reflect.DeepEqual(us[0], wu) {
|
|
t.Fatalf("up = %#v, want %#v", us[0], wu)
|
|
}
|
|
}
|
|
|
|
// TestGRPCResolverMultiInit ensures the resolver will initialize
|
|
// correctly with multiple hosts and correctly receive multiple
|
|
// updates in a single revision.
|
|
func TestGRPCResolverMulti(t *testing.T) {
|
|
defer testutil.AfterTest(t)
|
|
|
|
clus := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
|
|
defer clus.Terminate(t)
|
|
c := clus.RandClient()
|
|
|
|
v, verr := json.Marshal(naming.Update{Addr: "127.0.0.1", Metadata: "md"})
|
|
if verr != nil {
|
|
t.Fatal(verr)
|
|
}
|
|
if _, err := c.Put(context.TODO(), "foo/host", string(v)); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if _, err := c.Put(context.TODO(), "foo/host2", string(v)); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
r := GRPCResolver{c}
|
|
|
|
w, err := r.Resolve("foo")
|
|
if err != nil {
|
|
t.Fatal("failed to resolve foo", err)
|
|
}
|
|
defer w.Close()
|
|
|
|
updates, nerr := w.Next()
|
|
if nerr != nil {
|
|
t.Fatal(nerr)
|
|
}
|
|
if len(updates) != 2 {
|
|
t.Fatalf("expected two updates, got %+v", updates)
|
|
}
|
|
|
|
_, err = c.Txn(context.TODO()).Then(etcd.OpDelete("foo/host"), etcd.OpDelete("foo/host2")).Commit()
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
updates, nerr = w.Next()
|
|
if nerr != nil {
|
|
t.Fatal(nerr)
|
|
}
|
|
if len(updates) != 2 || (updates[0].Op != naming.Delete && updates[1].Op != naming.Delete) {
|
|
t.Fatalf("expected two updates, got %+v", updates)
|
|
}
|
|
}
|