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

Commit6a811c8

Browse files
committed
some cleanups around
1 parent6849188 commit6a811c8

File tree

6 files changed

+4
-52
lines changed

6 files changed

+4
-52
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
FROM kelvich/postgres_cluster
2-
# RUN sysctl -w kernel.core_pattern=core
3-
RUN cd /pg/src/contrib/raftable && make clean && make install
42

53
RUN mkdir /pg/mmts
64
COPY ./ /pg/mmts/
75

8-
RUN export RAFTABLE_PATH=/pg/src/contrib/raftable && \
9-
export USE_PGXS=1 && \
6+
RUN export USE_PGXS=1 && \
107
cd /pg/mmts && make clean && make install
118

129
# pg_regress client assumes such dir exists on server

‎Makefile‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
MODULE_big = multimaster
22
OBJS = multimaster.o arbiter.o bytebuf.o bgwpool.o pglogical_output.o pglogical_proto.o pglogical_receiver.o pglogical_apply.o pglogical_hooks.o pglogical_config.o pglogical_relid_map.o ddd.o bkb.o spill.o
33

4-
ifndefRAFTABLE_PATH
5-
RAFTABLE_PATH = ../raftable
6-
endif
7-
8-
overrideCPPFLAGS += -I$(RAFTABLE_PATH) -I$(RAFTABLE_PATH)/raft/include
9-
104
EXTENSION = multimaster
115
DATA = multimaster--1.0.sql
126

‎multimaster.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1794,7 +1794,6 @@ bool MtmRefreshClusterStatus(bool nowait)
17941794
inti;
17951795

17961796
if (!MtmBuildConnectivityMatrix(matrix,nowait)) {
1797-
/* RAFT is not available */
17981797
return false;
17991798
}
18001799

@@ -4493,7 +4492,7 @@ MtmDetectGlobalDeadLockFortXid(TransactionId xid)
44934492
MtmUnlockNode(i+MtmMaxNodes);
44944493

44954494
if (lockGraphData==NULL) {
4496-
return true;/* If using Raftable is disabled */
4495+
return true;
44974496
}else {
44984497
MtmGraphAdd(&graph, (GlobalTransactionId*)lockGraphData,lockGraphSize/sizeof(GlobalTransactionId));
44994498
}

‎multimaster.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,6 @@ typedef struct
179179
{
180180
charhostName[MULTIMASTER_MAX_HOST_NAME_SIZE];
181181
charconnStr[MULTIMASTER_MAX_CONN_STR_SIZE];
182-
intraftablePort;
183182
intarbiterPort;
184183
}MtmConnectionInfo;
185184

@@ -304,7 +303,6 @@ extern char* MtmDatabaseName;
304303
externchar*MtmDatabaseUser;
305304
externintMtmConnectTimeout;
306305
externintMtmReconnectTimeout;
307-
externintMtmRaftPollDelay;
308306
externintMtmNodeDisableDelay;
309307
externintMtmTransSpillThreshold;
310308
externintMtmHeartbeatSendTimeout;

‎raftable_wrapper.h‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎tests2/docker-entrypoint.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if [ "$1" = 'postgres' ]; then
5555
max_worker_processes = 30
5656
max_replication_slots = 10
5757
max_wal_senders = 10
58-
shared_preload_libraries = 'raftable,multimaster'
58+
shared_preload_libraries = 'multimaster'
5959
default_transaction_isolation = 'repeatable read'
6060
log_checkpoints = on
6161
checkpoint_timeout = 30
@@ -64,7 +64,7 @@ if [ "$1" = 'postgres' ]; then
6464
6565
multimaster.workers = 4
6666
multimaster.max_nodes = 3
67-
multimaster.use_raftable =false
67+
multimaster.volkswagen_mode =1
6868
multimaster.queue_size=52857600
6969
multimaster.ignore_tables_without_pk = 1
7070
multimaster.node_id =$NODE_ID

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp