Menu
▾
▴
postgres-xc-committers — Announces PG-XC repository commits
You can subscribe to this list here.
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(28) |
Jun
(12) |
Jul
(11) |
Aug
(12) |
Sep
(5) |
Oct
(19) |
Nov
(14) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2011 |
Jan
(18) |
Feb
(30) |
Mar
(115) |
Apr
(89) |
May
(50) |
Jun
(44) |
Jul
(22) |
Aug
(13) |
Sep
(11) |
Oct
(30) |
Nov
(28) |
Dec
(39) |
| 2012 |
Jan
(38) |
Feb
(18) |
Mar
(43) |
Apr
(91) |
May
(108) |
Jun
(46) |
Jul
(37) |
Aug
(44) |
Sep
(33) |
Oct
(29) |
Nov
(36) |
Dec
(15) |
| 2013 |
Jan
(35) |
Feb
(611) |
Mar
(5) |
Apr
(55) |
May
(30) |
Jun
(28) |
Jul
(458) |
Aug
(34) |
Sep
(9) |
Oct
(39) |
Nov
(22) |
Dec
(32) |
| 2014 |
Jan
(16) |
Feb
(16) |
Mar
(42) |
Apr
(179) |
May
(7) |
Jun
(6) |
Jul
(9) |
Aug
|
Sep
(4) |
Oct
|
Nov
(3) |
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
(4) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
1
(3) |
2
(5) |
3
|
4
(4) |
5
|
|
6
|
7
(7) |
8
(10) |
9
(6) |
10
(5) |
11
(1) |
12
|
|
13
|
14
|
15
|
16
|
17
(4) |
18
(1) |
19
|
|
20
|
21
(5) |
22
(15) |
23
(18) |
24
(7) |
25
(4) |
26
|
|
27
|
28
(3) |
29
(2) |
30
(11) |
31
(4) |
|
|
|
From: Koichi S. <koi...@us...> - 2011-03-04 09:08:22
|
Project "Postgres-XC".
The branch, ha_support has been updated
via 2876389f146b01bba0654c63e4d5eb635ffa8d8b (commit)
from 481225ce8dc621e258c872fed33f85fcbc4cbf31 (commit)
- Log -----------------------------------------------------------------
commit 2876389f146b01bba0654c63e4d5eb635ffa8d8b
Author: Koichi Suzuki <koi...@gm...>
Date: Fri Mar 4 18:08:24 2011 +0900
This is to fix the bug 3199366, to remove shared memory when xcm_initmember
finds fatal configuration error to continue.
diff --git a/src/pgxc/xcm/xcm_initmember.c b/src/pgxc/xcm/xcm_initmember.c
index 2e71542..ffa05f1 100644
--- a/src/pgxc/xcm/xcm_initmember.c
+++ b/src/pgxc/xcm/xcm_initmember.c
@@ -505,11 +505,6 @@ int main(int argc, char *argv[])
dump_datanodes(n_datanode, datanode);
#endif /* DEBUG_INITMEMBER */
}
- /*
- * Dump all the info if specified
- */
-
- /* ... TBS ... */
/*
* Calculate the total size of shared memory
@@ -607,7 +602,19 @@ int main(int argc, char *argv[])
rv = check_components(shm_top);
if (rv != 0)
{
- xcm_destroy_shm(); /* Shmem is detatched here */
+ char shmid_name[MAXPATH];
+ char shmad_name[MAXPATH];
+ struct shmid_ds buf;
+ /*
+ * Because shared memroy has been already attatched, we should not use
+ * xcm_destroy_shm();
+ */
+ rv = shmdt(shm_top);
+ shmctl(shm_id, IPC_RMID, &buf);
+ snprintf(shmid_name, MAXPATH, "%s/%s", get_xcmhome(), "shmid");
+ unlink(shmid_name);
+ snprintf(shmad_name, MAXPATH, "%s/%s", get_xcmhome(), "shmad");
+ unlink(shmad_name);
exit(1);
}
shm_top->size = totalsize;
-----------------------------------------------------------------------
Summary of changes:
src/pgxc/xcm/xcm_initmember.c | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
hooks/post-receive
--
Postgres-XC
|
|
From: Michael P. <mic...@us...> - 2011-03-04 07:19:11
|
Project "Postgres-XC".
The branch, merge_postgres_9_0_3 has been updated
via 062ecec9ab0e36f17f31624307470b8662dcfd80 (commit)
via 2e8115a86a7660fbb43a1cae72b8e406c7f82054 (commit)
from 7eb3c73d3750b900c2a8d1ce446c97f2db425ca1 (commit)
- Log -----------------------------------------------------------------
commit 062ecec9ab0e36f17f31624307470b8662dcfd80
Merge: 7eb3c73 2e8115a
Author: Michael P <mic...@us...>
Date: Fri Mar 4 16:18:54 2011 +0900
Merge branch 'master' into merge_postgres_9_0_3
-----------------------------------------------------------------------
Summary of changes:
src/gtm/common/elog.c | 5 ++++-
src/gtm/main/main.c | 6 ++++++
src/gtm/proxy/proxy_main.c | 5 +++++
src/include/gtm/gtm.h | 2 ++
src/include/gtm/gtm_proxy.h | 1 +
5 files changed, 18 insertions(+), 1 deletions(-)
hooks/post-receive
--
Postgres-XC
|
|
From: Michael P. <mic...@us...> - 2011-03-04 07:18:31
|
Project "Postgres-XC".
The branch, ha_support has been updated
via 481225ce8dc621e258c872fed33f85fcbc4cbf31 (commit)
via 2e8115a86a7660fbb43a1cae72b8e406c7f82054 (commit)
from 29ea460de8f7e66093c7b38cd49e238aed2ba129 (commit)
- Log -----------------------------------------------------------------
commit 481225ce8dc621e258c872fed33f85fcbc4cbf31
Merge: 29ea460 2e8115a
Author: Michael P <mic...@us...>
Date: Fri Mar 4 16:17:57 2011 +0900
Merge branch 'master' into ha_support
-----------------------------------------------------------------------
Summary of changes:
src/gtm/common/elog.c | 5 ++++-
src/gtm/main/main.c | 6 ++++++
src/gtm/proxy/proxy_main.c | 5 +++++
src/include/gtm/gtm.h | 2 ++
src/include/gtm/gtm_proxy.h | 1 +
5 files changed, 18 insertions(+), 1 deletions(-)
hooks/post-receive
--
Postgres-XC
|
|
From: Michael P. <mic...@us...> - 2011-03-04 07:16:53
|
Project "Postgres-XC".
The branch, master has been updated
via 2e8115a86a7660fbb43a1cae72b8e406c7f82054 (commit)
from 3ba29c3723ed6a31b0faa8fea0b9a7e57ca0c25d (commit)
- Log -----------------------------------------------------------------
commit 2e8115a86a7660fbb43a1cae72b8e406c7f82054
Author: Michael P <mic...@us...>
Date: Fri Mar 4 16:13:56 2011 +0900
Fix for bug 3199029 GTM/GTM-proxy FATAL error handling
Fix to make the main thread of GTM to return a non-null value
when in error state.
Patch by Pavan Deolasee
diff --git a/src/gtm/common/elog.c b/src/gtm/common/elog.c
index cc6a9a5..3ca6355 100644
--- a/src/gtm/common/elog.c
+++ b/src/gtm/common/elog.c
@@ -355,7 +355,10 @@ errfinish(int dummy,...)
* FATAL termination. The postmaster may or may not consider this
* worthy of panic, depending on which subprocess returns it.
*/
- pthread_exit(NULL);
+ if (IsMainThread())
+ exit(1);
+ else
+ pthread_exit(NULL);
}
if (elevel >= PANIC)
diff --git a/src/gtm/main/main.c b/src/gtm/main/main.c
index ea6d5d2..80f35b3 100644
--- a/src/gtm/main/main.c
+++ b/src/gtm/main/main.c
@@ -55,6 +55,8 @@ int GTMPortNumber;
char GTMControlFile[GTM_MAX_PATH];
char *GTMDataDir;
+GTM_ThreadID TopMostThreadID;
+
/* The socket(s) we're listening to. */
#define MAXLISTEN 64
static int ListenSocket[MAXLISTEN];
@@ -113,6 +115,7 @@ MainThreadInit()
fprintf(stderr, "malloc failed: %d", errno);
fflush(stdout);
fflush(stderr);
+ exit(1);
}
if (SetMyThreadInfo(thrinfo))
@@ -120,8 +123,11 @@ MainThreadInit()
fprintf(stderr, "SetMyThreadInfo failed: %d", errno);
fflush(stdout);
fflush(stderr);
+ exit(1);
}
+ TopMostThreadID = pthread_self();
+
return thrinfo;
}
diff --git a/src/gtm/proxy/proxy_main.c b/src/gtm/proxy/proxy_main.c
index d892680..f1e8553 100644
--- a/src/gtm/proxy/proxy_main.c
+++ b/src/gtm/proxy/proxy_main.c
@@ -61,6 +61,7 @@ char *GTMServerHost;
int GTMServerPortNumber;
GTM_PGXCNodeId GTMProxyID = 0;
+GTM_ThreadID TopMostThreadID;
/* The socket(s) we're listening to. */
#define MAXLISTEN 64
@@ -145,6 +146,7 @@ MainThreadInit()
fprintf(stderr, "malloc failed: %d", errno);
fflush(stdout);
fflush(stderr);
+ exit(1);
}
if (SetMyThreadInfo(thrinfo))
@@ -152,8 +154,11 @@ MainThreadInit()
fprintf(stderr, "SetMyThreadInfo failed: %d", errno);
fflush(stdout);
fflush(stderr);
+ exit(1);
}
+ TopMostThreadID = pthread_self();
+
return thrinfo;
}
diff --git a/src/include/gtm/gtm.h b/src/include/gtm/gtm.h
index 5041b0e..91eff99 100644
--- a/src/include/gtm/gtm.h
+++ b/src/include/gtm/gtm.h
@@ -93,6 +93,7 @@ GTM_ThreadInfo * GTM_GetThreadInfo(GTM_ThreadID thrid);
*/
extern pthread_key_t threadinfo_key;
extern MemoryContext TopMostMemoryContext;
+extern GTM_ThreadID TopMostThreadID;
#define SetMyThreadInfo(thrinfo) pthread_setspecific(threadinfo_key, (thrinfo))
#define GetMyThreadInfo ((GTM_ThreadInfo *)pthread_getspecific(threadinfo_key))
@@ -113,6 +114,7 @@ extern MemoryContext TopMostMemoryContext;
GetMyThreadInfo->thr_conn->con_port : \
NULL)
#define MyThreadID (GetMyThreadInfo->thr_id)
+#define IsMainThread() (GetMyThreadInfo->thr_id == TopMostThreadID)
#define GTM_CachedTransInfo (GetMyThreadInfo->thr_cached_txninfo)
#define GTM_HaveFreeCachedTransInfo() (list_length(GTM_CachedTransInfo))
diff --git a/src/include/gtm/gtm_proxy.h b/src/include/gtm/gtm_proxy.h
index 9b721e1..0031d6e 100644
--- a/src/include/gtm/gtm_proxy.h
+++ b/src/include/gtm/gtm_proxy.h
@@ -200,6 +200,7 @@ typedef struct GTMProxy_CommandInfo
extern pthread_key_t threadinfo_key;
extern MemoryContext TopMostMemoryContext;
extern char *GTMLogFile;
+extern GTM_ThreadID TopMostThreadID;
#define SetMyThreadInfo(thrinfo) pthread_setspecific(threadinfo_key, (thrinfo))
#define GetMyThreadInfo ((GTMProxy_ThreadInfo *)pthread_getspecific(threadinfo_key))
-----------------------------------------------------------------------
Summary of changes:
src/gtm/common/elog.c | 5 ++++-
src/gtm/main/main.c | 6 ++++++
src/gtm/proxy/proxy_main.c | 5 +++++
src/include/gtm/gtm.h | 2 ++
src/include/gtm/gtm_proxy.h | 1 +
5 files changed, 18 insertions(+), 1 deletions(-)
hooks/post-receive
--
Postgres-XC
|
