[prev in list] [next in list] [prev in thread] [next in thread]
List: grid-engine-cvs
Subject: CVS update: MODIFIED: gdi ...
From: crei () sunsource ! net
Date: 2004-06-18 14:28:41
Message-ID: 20040618142841.3232.qmail () s005 ! sfo ! collab ! net
[Download RAW message or body]
User: crei
Date: 04/06/18 07:28:41
Modified: source/libs/gdi Tag: V60_FCS_fixes_BRANCH sge_any_request.c
Added: review Tag: V60_FCS_fixes_BRANCH CR-2004-06-18-0.txt
Log:
CR-2004-06-18-0: Bugfix: o sge_qmaster will not start unless run only as "root"
o qmaster cannot bind port below 1024 on Linux
Changed: qmaster
Issue: 1096, 1098
Bugtraq: 5063987
Issue number:
Revision Changes Path
No revision
http://gridengine.sunsource.net/source/browse/gridengine/Tag:
No revision
http://gridengine.sunsource.net/source/browse/gridengine/V60_FCS_fixes_BRANCH
1.2086.4.2 +11 -0 gridengine/Changelog
http://gridengine.sunsource.net/source/browse/gridengine/Changelog.diff?r1=1.2086.4.1&r2=1.2086.4.2
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Changelog
===================================================================
RCS file: /cvs/gridengine/Changelog,v
retrieving revision 1.2086.4.1
retrieving revision 1.2086.4.2
diff -u -b -r1.2086.4.1 -r1.2086.4.2
--- Changelog 2004/06/17 12:56:30 1.2086.4.1
+++ Changelog 2004/06/18 14:28:33 1.2086.4.2
@@ -1,3 +1,14 @@
+CR-2004-06-18-1: Testsuite: - new check for CR-2004-06-18-0 ( issues 1096 and \
1098) + - new configuration parameter: reserved_port
+ - fixed testsuite problem on shutdown of multi \
threaded + qmaster process(es!) on linux systems.
+
+CR-2004-06-18-0: Bugfix: o sge_qmaster will not start unless run only as "root"
+ o qmaster cannot bind port below 1024 on Linux
+ Changed: qmaster
+ Issue: 1096, 1098
+ Bugtraq: 5063987
+
SG-2004-06-16-0: Bugfix: Fixes wrong info-messages handling in the scheduler
and the use of job categories for dispatching.
Review: JG
No revision
http://gridengine.sunsource.net/source/browse/gridengine/review/Tag:
No revision
http://gridengine.sunsource.net/source/browse/gridengine/review/V60_FCS_fixes_BRANCH
1.1.2.1 +0 -0 gridengine/review/CR-2004-06-18-0.txt
http://gridengine.sunsource.net/source/browse/gridengine/review/CR-2004-06-18-0.txt.diff?r1=1.1&r2=1.1.2.1
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CR-2004-06-18-0.txt
===================================================================
RCS file: /cvs/gridengine/review/CR-2004-06-18-0.txt,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
No revision
http://gridengine.sunsource.net/source/browse/gridengine/source/daemons/qmaster/Tag:
No revision
http://gridengine.sunsource.net/source/browse/gridengine/source/daemons/qmaster/V60_FCS_fixes_BRANCH
1.113.4.1 +8 -9 gridengine/source/daemons/qmaster/setup_qmaster.c
http://gridengine.sunsource.net/source/browse/gridengine/source/daemons/qmaster/setup_qmaster.c.diff?r1=1.113&r2=1.113.4.1
(In the diff below, changes in quantity of whitespace are not shown.)
Index: setup_qmaster.c
===================================================================
RCS file: /cvs/gridengine/source/daemons/qmaster/setup_qmaster.c,v
retrieving revision 1.113
retrieving revision 1.113.4.1
diff -u -b -r1.113 -r1.113.4.1
--- setup_qmaster.c 2004/06/01 16:41:21 1.113
+++ setup_qmaster.c 2004/06/18 14:28:36 1.113.4.1
@@ -188,7 +188,7 @@
* sge_qmaster_thread_init() -- Initialize a qmaster thread.
*
* SYNOPSIS
-* int sge_qmaster_thread_init(void)
+* int sge_qmaster_thread_init(bool switch_to_admin_user)
*
* FUNCTION
* Subsume functions which need to be called immediately after thread
@@ -196,7 +196,7 @@
* structures do contain reasonable values.
*
* INPUTS
-* void - none
+* bool switch_to_admin_user - become admin user if set to true
*
* RESULT
* 0 - success
@@ -208,7 +208,7 @@
* MT-NOTE: of a thread function.
*
*******************************************************************************/
-int sge_qmaster_thread_init(void)
+int sge_qmaster_thread_init(bool switch_to_admin_user)
{
DENTER(TOP_LAYER, "sge_qmaster_thread_init");
@@ -221,11 +221,11 @@
DEBUG((SGE_EVENT,"%s: qualified hostname \"%s\"\n", SGE_FUNC, \
uti_state_get_qualified_hostname()));
#if defined(LINUX86) || defined(LINUXAMD64) || defined(LINUXIA64)
- {
- char str[1024];
-
uidgid_mt_init();
+#endif
+ if ( switch_to_admin_user == true ) {
+ char str[1024];
if (sge_set_admin_username(bootstrap_get_admin_user(), str) == -1) {
CRITICAL((SGE_EVENT, str));
SGE_EXIT(1);
@@ -236,7 +236,6 @@
SGE_EXIT(1);
}
}
-#endif
DEXIT;
return 0;
1.6.4.1 +1 -1 gridengine/source/daemons/qmaster/setup_qmaster.h
http://gridengine.sunsource.net/source/browse/gridengine/source/daemons/qmaster/setup_qmaster.h.diff?r1=1.6&r2=1.6.4.1
(In the diff below, changes in quantity of whitespace are not shown.)
Index: setup_qmaster.h
===================================================================
RCS file: /cvs/gridengine/source/daemons/qmaster/setup_qmaster.h,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -b -r1.6 -r1.6.4.1
--- setup_qmaster.h 2004/05/19 10:43:48 1.6
+++ setup_qmaster.h 2004/06/18 14:28:36 1.6.4.1
@@ -36,7 +36,7 @@
int sge_setup_qmaster(char* anArgv[]);
-int sge_qmaster_thread_init(void);
+int sge_qmaster_thread_init(bool switch_to_admin_user);
void sge_setup_job_resend(void);
1.40.4.1 +9 -5 gridengine/source/daemons/qmaster/sge_qmaster_main.c
http://gridengine.sunsource.net/source/browse/gridengine/source/daemons/qmaster/sge_qmaster_main.c.diff?r1=1.40&r2=1.40.4.1
(In the diff below, changes in quantity of whitespace are not shown.)
Index: sge_qmaster_main.c
===================================================================
RCS file: /cvs/gridengine/source/daemons/qmaster/sge_qmaster_main.c,v
retrieving revision 1.40
retrieving revision 1.40.4.1
diff -u -b -r1.40 -r1.40.4.1
--- sge_qmaster_main.c 2004/05/19 10:43:49 1.40
+++ sge_qmaster_main.c 2004/06/18 14:28:37 1.40.4.1
@@ -172,7 +172,7 @@
sge_mt_init();
sigfillset(&sig_set);
pthread_sigmask(SIG_SETMASK, &sig_set, NULL);
- sge_qmaster_thread_init();
+ sge_qmaster_thread_init(true);
sge_process_qmaster_cmdline(argv);
SGE_EXIT(1);
}
@@ -184,10 +184,14 @@
sigfillset(&sig_set);
pthread_sigmask(SIG_SETMASK, &sig_set, NULL);
- sge_qmaster_thread_init();
+ /* init qmaster threads without becomming admin user */
+ sge_qmaster_thread_init(false);
+
+ /* this must be done as root user to be able to bind ports < 1024 */
prepare_enroll(prognames[QMASTER]);
+ /* now we become admin user */
become_admin_user();
sge_chdir_exit(bootstrap_get_qmaster_spool_dir(), 1);
@@ -1015,7 +1019,7 @@
DENTER(TOP_LAYER, "signal_thread");
- sge_qmaster_thread_init();
+ sge_qmaster_thread_init(true);
sigemptyset(&sig_set);
sigaddset(&sig_set, SIGINT);
@@ -1068,7 +1072,7 @@
{
DENTER(TOP_LAYER, "message_thread");
- sge_qmaster_thread_init();
+ sge_qmaster_thread_init(true);
while (should_terminate() == false)
{
1.10.6.1 +1 -1 gridengine/source/daemons/qmaster/sge_qmaster_timed_event.c
http://gridengine.sunsource.net/source/browse/gridengine/source/daemons/qmaster/sge_qmaster_timed_event.c.diff?r1=1.10&r2=1.10.6.1
(In the diff below, changes in quantity of whitespace are not shown.)
Index: sge_qmaster_timed_event.c
===================================================================
RCS file: /cvs/gridengine/source/daemons/qmaster/sge_qmaster_timed_event.c,v
retrieving revision 1.10
retrieving revision 1.10.6.1
diff -u -b -r1.10 -r1.10.6.1
--- sge_qmaster_timed_event.c 2004/04/08 10:56:00 1.10
+++ sge_qmaster_timed_event.c 2004/06/18 14:28:37 1.10.6.1
@@ -833,7 +833,7 @@
DENTER(TOP_LAYER, "deliver_events");
- sge_qmaster_thread_init();
+ sge_qmaster_thread_init(true);
while (should_exit() == false) {
sge_mutex_lock("event_control_mutex", SGE_FUNC, __LINE__, \
&Event_Control.mutex);
No revision
http://gridengine.sunsource.net/source/browse/gridengine/source/daemons/shepherd/Tag:
No revision
http://gridengine.sunsource.net/source/browse/gridengine/source/daemons/shepherd/V60_FCS_fixes_BRANCH
1.4.8.1 +5 -0 gridengine/source/daemons/shepherd/signal_queue.c
http://gridengine.sunsource.net/source/browse/gridengine/source/daemons/shepherd/signal_queue.c.diff?r1=1.4&r2=1.4.8.1
(In the diff below, changes in quantity of whitespace are not shown.)
Index: signal_queue.c
===================================================================
RCS file: /cvs/gridengine/source/daemons/shepherd/signal_queue.c,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -u -b -r1.4 -r1.4.8.1
--- signal_queue.c 2002/12/09 13:51:29 1.4
+++ signal_queue.c 2004/06/18 14:28:38 1.4.8.1
@@ -31,11 +31,16 @@
/*___INFO__MARK_END__*/
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <stdio.h>
#include <ctype.h>
#include "signal_queue.h"
#include "err_trace.h"
#include "sge_signal.h"
+
#define MAXSIG 100
No revision
http://gridengine.sunsource.net/source/browse/gridengine/source/libs/comm/Tag:
No revision
http://gridengine.sunsource.net/source/browse/gridengine/source/libs/comm/V60_FCS_fixes_BRANCH
1.22.4.1 +2 -2 gridengine/source/libs/comm/cl_commlib.c
http://gridengine.sunsource.net/source/browse/gridengine/source/libs/comm/cl_commlib.c.diff?r1=1.22&r2=1.22.4.1
(In the diff below, changes in quantity of whitespace are not shown.)
Index: cl_commlib.c
===================================================================
RCS file: /cvs/gridengine/source/libs/comm/cl_commlib.c,v
retrieving revision 1.22
retrieving revision 1.22.4.1
diff -u -b -r1.22 -r1.22.4.1
--- cl_commlib.c 2004/05/26 14:36:01 1.22
+++ cl_commlib.c 2004/06/18 14:28:38 1.22.4.1
@@ -924,10 +924,10 @@
trigger_write = CL_TRUE;
elem->connection->connection_sub_state = CL_COM_SENDING_CCM;
}
- CL_LOG_STR(CL_LOG_ERROR,"wait for connection removal, current state \
is", + CL_LOG_STR(CL_LOG_INFO,"wait for connection removal, current \
state is", cl_com_get_connection_state(elem->connection));
if ( ignore_timeout == CL_TRUE ) {
- CL_LOG(CL_LOG_WARNING,"we are connected, don't ignore timeouts");
+ CL_LOG(CL_LOG_INFO,"we are connected, don't ignore timeouts");
ignore_timeout = CL_FALSE;
}
}
No revision
http://gridengine.sunsource.net/source/browse/gridengine/source/libs/evm/Tag:
No revision
http://gridengine.sunsource.net/source/browse/gridengine/source/libs/evm/V60_FCS_fixes_BRANCH
1.75.4.1 +1 -1 gridengine/source/libs/evm/sge_event_master.c
http://gridengine.sunsource.net/source/browse/gridengine/source/libs/evm/sge_event_master.c.diff?r1=1.75&r2=1.75.4.1
(In the diff below, changes in quantity of whitespace are not shown.)
Index: sge_event_master.c
===================================================================
RCS file: /cvs/gridengine/source/libs/evm/sge_event_master.c,v
retrieving revision 1.75
retrieving revision 1.75.4.1
diff -u -b -r1.75 -r1.75.4.1
--- sge_event_master.c 2004/05/25 14:34:02 1.75
+++ sge_event_master.c 2004/06/18 14:28:39 1.75.4.1
@@ -2255,7 +2255,7 @@
DENTER(TOP_LAYER, "send_thread");
- sge_qmaster_thread_init();
+ sge_qmaster_thread_init(true);
report_list = lCreateListHash("report list", REP_Type, false);
report = lCreateElem(REP_Type);
No revision
http://gridengine.sunsource.net/source/browse/gridengine/source/libs/gdi/Tag:
No revision
http://gridengine.sunsource.net/source/browse/gridengine/source/libs/gdi/V60_FCS_fixes_BRANCH
1.44.4.1 +10 -0 gridengine/source/libs/gdi/sge_any_request.c
http://gridengine.sunsource.net/source/browse/gridengine/source/libs/gdi/sge_any_request.c.diff?r1=1.44&r2=1.44.4.1
(In the diff below, changes in quantity of whitespace are not shown.)
Index: sge_any_request.c
===================================================================
RCS file: /cvs/gridengine/source/libs/gdi/sge_any_request.c,v
retrieving revision 1.44
retrieving revision 1.44.4.1
diff -u -b -r1.44 -r1.44.4.1
--- sge_any_request.c 2004/05/26 06:32:48 1.44
+++ sge_any_request.c 2004/06/18 14:28:40 1.44.4.1
@@ -324,6 +324,16 @@
INFO((SGE_EVENT, MSG_GDI_HANDLE_CREATED_FOR_S, \
uti_state_get_sge_formal_prog_name() )); }
}
+
+
+ /* this is for testsuite socket bind test (issue 1096 ) */
+ if ( getenv("SGE_TEST_SOCKET_BIND") != NULL) {
+ /* if this environment variable is set, we wait 15 seconds after
+ communication lib setup */
+ DPRINTF(("waiting for 15 seconds, because environment SGE_TEST_SOCKET_BIND \
is set\n")); + sleep(15);
+ }
+
DEXIT;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic