hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From odiache...@apache.org
Subject [13/38] incubator-hawq git commit: HAWQ-579. As we hasn't supported the guc value get_tmpdir_from_rm to be true, so remove them and add error information when users set get_tmpdir_from_rm=true;
Date Thu, 31 Mar 2016 00:24:06 GMT
HAWQ-579. As we hasn't supported the guc value get_tmpdir_from_rm to be true, so remove them
and add error information when users set get_tmpdir_from_rm=true;


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/bacd1419
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/bacd1419
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/bacd1419

Branch: refs/heads/HAWQ-546
Commit: bacd1419a0b69c59e7194d8c83f87f0c14e1962c
Parents: b23f7ad
Author: doli <doli@pivotal.io>
Authored: Wed Mar 23 14:37:56 2016 +0800
Committer: Oleksandr Diachenko <odiachenko@pivotal.io>
Committed: Wed Mar 30 17:23:28 2016 -0700

----------------------------------------------------------------------
 src/backend/postmaster/identity.c                         | 10 +++++++++-
 src/backend/resourcemanager/communication/rmcomm_QD2RM.c  |  3 ++-
 .../resourcemanager/include/communication/rmcomm_QD2RM.h  |  2 +-
 src/backend/utils/init/postinit.c                         |  4 ++++
 4 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/bacd1419/src/backend/postmaster/identity.c
----------------------------------------------------------------------
diff --git a/src/backend/postmaster/identity.c b/src/backend/postmaster/identity.c
index f4dd1ed..1bb558d 100644
--- a/src/backend/postmaster/identity.c
+++ b/src/backend/postmaster/identity.c
@@ -100,8 +100,9 @@ static SegmentIdentity SegmentId = { SEGMENT_ROLE_INVALID };
 static void DebugSegmentIdentity(struct SegmentIdentity *id);
 static void DebugProcessIdentity(struct ProcessIdentity *id);
 static bool	DeserializeProcessIdentity(struct ProcessIdentity *id, const char *str);
-static void GetLocalTmpDirFromRM(char *host, uint16_t port, int session_id, int command_id,
int qeidx);
+//static void GetLocalTmpDirFromRM(char *host, uint16_t port, int session_id, int command_id,
int qeidx);
 
+/*
 static void
 GetLocalTmpDirFromRM(char *host,
 					 uint16_t port,
@@ -156,6 +157,7 @@ GetLocalTmpDirFromRM(char *host,
                 session_id, command_id, qeidx); 
     }
 }
+*/
 
 static void
 SetSegmentRole(const char *name, SegmentIdentity *segment)
@@ -384,7 +386,10 @@ SetupProcessIdentity(const char *str)
         
         if (get_tmpdir_from_rm)
         {
+            elog(ERROR, "The GUC value get_tmpdir_from_rm to be true hasn't been supported
yet. "
+			"Please set get_tmpdir_from_rm=false ");
             /* If QE is under one segment. */
+            /*
             if ( GetQEIndex() != -1 ) {
                 GetLocalTmpDirFromRM("127.0.0.1",//DRMGlobalInstance->SocketLocalHostName.Str,
                                      rm_segment_port,
@@ -392,7 +397,9 @@ SetupProcessIdentity(const char *str)
                                      gp_command_count,
                                      GetQEIndex());
             }
+            */
             /* QE is under master. */
+            /*
             else {
                 GetLocalTmpDirFromRM("127.0.0.1",//DRMGlobalInstance->SocketLocalHostName.Str,
                                      rm_master_port,
@@ -403,6 +410,7 @@ SetupProcessIdentity(const char *str)
 
             elog(DEBUG1, "Get temporary directory from segment resource manager, %s",
         		    LocalTempPath);
+            */
         }
         else
         {

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/bacd1419/src/backend/resourcemanager/communication/rmcomm_QD2RM.c
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/communication/rmcomm_QD2RM.c b/src/backend/resourcemanager/communication/rmcomm_QD2RM.c
index 59494a0..f08f9d5 100644
--- a/src/backend/resourcemanager/communication/rmcomm_QD2RM.c
+++ b/src/backend/resourcemanager/communication/rmcomm_QD2RM.c
@@ -1221,6 +1221,7 @@ exit:
 	destroySelfMaintainBuffer(&recvbuffer);
 }
 
+/*
 int getLocalTmpDirFromMasterRM(char *errorbuf, int errorbufsize)
 {
 	static char 	 errorbuf2[ERRORMESSAGE_SIZE];
@@ -1273,7 +1274,7 @@ exit:
 	destroySelfMaintainBuffer(&recvbuffer);
 	return res;
 }
-
+*/
 
 int acquireResourceQuotaFromRM(int64_t		user_oid,
 							   uint32_t		max_seg_count_fix,

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/bacd1419/src/backend/resourcemanager/include/communication/rmcomm_QD2RM.h
----------------------------------------------------------------------
diff --git a/src/backend/resourcemanager/include/communication/rmcomm_QD2RM.h b/src/backend/resourcemanager/include/communication/rmcomm_QD2RM.h
index 98a51b7..1fdc02c 100644
--- a/src/backend/resourcemanager/include/communication/rmcomm_QD2RM.h
+++ b/src/backend/resourcemanager/include/communication/rmcomm_QD2RM.h
@@ -167,7 +167,7 @@ void SendResourceRefreshHeartBeat(void);
 
 void sendFailedNodeToResourceManager(int hostNum, char **pghost);
 
-int getLocalTmpDirFromMasterRM(char *errorbuf, int errorbufsize);
+//int getLocalTmpDirFromMasterRM(char *errorbuf, int errorbufsize);
 
 int dumpResourceManagerStatus(uint32_t		 type,
 							  const char	*dump_file,

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/bacd1419/src/backend/utils/init/postinit.c
----------------------------------------------------------------------
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 904aa67..c2e3c96 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -448,12 +448,16 @@ InitPostgres(const char *in_dbname, Oid dboid, const char *username,
     {
         if (get_tmpdir_from_rm)
         {
+            elog(ERROR, "The GUC value get_tmpdir_from_rm to be true hasn't been supported
yet. "
+			"Please set get_tmpdir_from_rm=false ");
+            /*
         	char errorbuf[ERRORMESSAGE_SIZE] = "";
             int res = getLocalTmpDirFromMasterRM(errorbuf, sizeof(errorbuf));
             if ( res != FUNC_RETURN_OK )
             {
             	elog(ERROR, "%s", errorbuf);
             }
+            */
         }
         else
         {


Mime
View raw message