Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backport corrupt check test fix "etcd server shouldn't wait for the ready notification infinitely on startup"

Browse Source 
Signed-off-by: Marek Siarkowicz <siarkowicz@google.com>
This commit is contained in:
Marek Siarkowicz 2023-10-02 12:28:00 +02:00
parent 04cfb4c660
commit 5b8150a6cf
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/e2e/corrupt_test.go
View File

@ -12,11 +12,15 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
//go:build !cluster_proxy
// +build !cluster_proxy
package e2e package e2e
import ( import (
"context" "context"
"fmt" "fmt"
"sync"
"testing" "testing"
"time" "time"
@ -152,23 +156,31 @@ func TestInPlaceRecovery(t *testing.T) {
newCc := NewEtcdctl(epcNew.EndpointsV3(), clientNonTLS, false, false) newCc := NewEtcdctl(epcNew.EndpointsV3(), clientNonTLS, false, false)
assert.NoError(t, err) assert.NoError(t, err)
wg := sync.WaitGroup{}
// Rolling recovery of the servers. // Rolling recovery of the servers.
t.Log("rolling updating servers in place...") t.Log("rolling updating servers in place...")
for i, newProc := range epcNew.procs { for i := range epcNew.procs {
oldProc := epcOld.procs[i] oldProc := epcOld.procs[i]
err = oldProc.Close() err = oldProc.Close()
if err != nil { if err != nil {
t.Fatalf("could not stop etcd process (%v)", err) t.Fatalf("could not stop etcd process (%v)", err)
} }
t.Logf("old cluster server %d: %s stopped.", i, oldProc.Config().name) t.Logf("old cluster server %d: %s stopped.", i, oldProc.Config().name)
err = newProc.Start() wg.Add(1)
// Start servers in background to avoid blocking on server start.
// EtcdProcess.Start waits until etcd becomes healthy, which will not happen here until we restart at least 2 members.
go func(proc etcdProcess) {
defer wg.Done()
err = proc.Start()
if err != nil { if err != nil {
t.Fatalf("could not start etcd process (%v)", err) t.Errorf("could not start etcd process (%v)", err)
} }
t.Logf("new cluster server %d: %s started in-place with blank db.", i, newProc.Config().name) t.Logf("new cluster server: %s started in-place with blank db.", proc.Config().name)
}(epcNew.procs[i])
t.Log("sleeping 5 sec to let nodes do periodical check...") t.Log("sleeping 5 sec to let nodes do periodical check...")
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
} }
wg.Wait()
t.Log("new cluster started.") t.Log("new cluster started.")
alarmResponse, err := newCc.AlarmList() alarmResponse, err := newCc.AlarmList()