Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit63dc30c

Browse files
knizhnikkelvich
authored andcommitted
Update travis tests
1 parent4db6be6 commit63dc30c

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

‎arbiter.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ static int MtmConnectSocket(int node, int port, int timeout)
396396
unsignedi,n_addrs=sizeof(addrs) /sizeof(addrs[0]);
397397
MtmHandshakeMessagereq;
398398
MtmArbiterMessageresp;
399-
intrc,sd;
399+
intsd;
400400
timestamp_tstart=MtmGetSystemTime();
401401
charconst*host=Mtm->nodes[node].con.hostName;
402402

@@ -476,10 +476,7 @@ static int MtmConnectSocket(int node, int port, int timeout)
476476
close(sd);
477477
gotoRetry;
478478
}
479-
while ((rc=MtmWaitSocket(sd, false,MtmHeartbeatSendTimeout))==0) {
480-
elog(WARNING,"Arbiter waiting response for handshake message from %s:%d: rc=%d, error=%d",host,port,rc,errno);
481-
}
482-
if (rc!=1||MtmReadSocket(sd,&resp,sizeofresp)!=sizeof(resp)) {
479+
if (MtmReadSocket(sd,&resp,sizeofresp)!=sizeof(resp)) {
483480
elog(WARNING,"Arbiter failed to receive response for handshake message from %s:%d: errno=%d",host,port,errno);
484481
close(sd);
485482
gotoRetry;

‎t/001_basic_recovery.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
my$psql_out;
1717
# XXX: create extension on start and poll_untill status is Online
18-
sleep(5);
18+
sleep(10);
1919

2020
###############################################################################
2121
# Replication check
@@ -60,7 +60,7 @@
6060
diag("starting node 2");
6161
$cluster->{nodes}->[2]->start;
6262
#diag("sleeping 10");
63-
#sleep(10); # XXX: here we can poll
63+
sleep(10);# XXX: here we can poll
6464

6565
$cluster->psql(0,'postgres',"select mtm.poll_node(3);");
6666

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp