From 7e4f92e42759d1981455dfc232843e162f31b9a5 Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Fri, 7 Dec 2012 18:22:01 -0800 Subject: [PATCH 1/8] Debug support and additional fixes for community specfile. --- buildutils/torque.spec.in | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/buildutils/torque.spec.in b/buildutils/torque.spec.in index 984c25319a..cba53fdddf 100644 --- a/buildutils/torque.spec.in +++ b/buildutils/torque.spec.in @@ -16,6 +16,7 @@ ### Features disabled by default %bcond_with blcr %bcond_with cpuset +%bcond_with debug %bcond_with drmaa %bcond_with gui %bcond_with libcpuset @@ -33,6 +34,7 @@ ### Autoconf macro expansions %define ac_with_blcr --%{?with_blcr:en}%{!?with_blcr:dis}able-blcr %define ac_with_cpuset --%{?with_cpuset:en}%{!?with_cpuset:dis}able-cpuset +%define ac_with_debug --with%{!?with_debug:out}-debug CFLAGS="-O0 -g3" %define ac_with_drmaa --%{?with_drmaa:en}%{!?with_drmaa:dis}able-drmaa %define ac_with_gui --%{?with_gui:en}%{!?with_gui:dis}able-gui --with%{!?with_gui:out}-tcl %define ac_with_munge --%{?with_munge:en}%{!?with_munge:dis}able-munge-auth @@ -57,18 +59,22 @@ %{!?torque_server:%global torque_server localhost} %{!?sendmail_path:%global sendmail_path %{_sbindir}/sendmail} -### Do not strip executables -#define __os_install_post /usr/lib/rpm/brp-compress +### Do not strip executables when debugging. +%if %{with debug} +%global __os_install_post /usr/lib/rpm/brp-compress +%global __debug_install_post %{nil} +%global debug_package %{nil} +%endif ### Handle logic for snapshots %define tarversion @SPEC_VERSION@ #define snap 0 %if %{?snap}0 %{expand:%%define version %(echo %{tarversion} | sed 's/-snap\..*$//')} -%{expand:%%define release 0.cri.snap.%(echo %{tarversion} | sed 's/^.*-snap\.//')} +%{expand:%%define release 0.adaptive.snap.%(echo %{tarversion} | sed 's/^.*-snap\.//')}.0%{?dist}} %else %define version %{tarversion} -%define release 1.cri +%define release 1.adaptive%{?dist} %endif Name: @SPEC_NAME@ @@ -172,7 +178,8 @@ CXXFLAGS="%{?cxxflags:%{cxxflags}}%{!?cxxflags:$RPM_OPT_FLAGS}" export CFLAGS CXXFLAGS %configure --includedir=%{_includedir}/%{name} --with-default-server=%{torque_server} \ - --with-server-home=%{torque_home} --with-sendmail=%{sendmail_path} \ + --with-server-home=%{torque_home} %{ac_with_debug} %{ac_with_libcpuset} \ + --with-sendmail=%{sendmail_path} %{ac_with_numa} %{ac_with_memacct} %{ac_with_top} \ --disable-dependency-tracking %{ac_with_gui} %{ac_with_scp} %{ac_with_syslog} \ --disable-gcc-warnings %{ac_with_munge} %{ac_with_pam} %{ac_with_drmaa} \ --disable-qsub-keep-override %{ac_with_blcr} %{ac_with_cpuset} %{ac_with_spool} %{?acflags} From e02f50acaae82626d91e39f1c2d19b02322a3d2e Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Fri, 7 Dec 2012 19:00:17 -0800 Subject: [PATCH 2/8] Fix typo in macro expansion. --- buildutils/torque.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildutils/torque.spec.in b/buildutils/torque.spec.in index cba53fdddf..31f2f56898 100644 --- a/buildutils/torque.spec.in +++ b/buildutils/torque.spec.in @@ -71,7 +71,7 @@ #define snap 0 %if %{?snap}0 %{expand:%%define version %(echo %{tarversion} | sed 's/-snap\..*$//')} -%{expand:%%define release 0.adaptive.snap.%(echo %{tarversion} | sed 's/^.*-snap\.//')}.0%{?dist}} +%{expand:%%define release 0.adaptive.snap.%(echo %{tarversion} | sed 's/^.*-snap\.//').0%{?dist}} %else %define version %{tarversion} %define release 1.adaptive%{?dist} From faf6b19f123b505778ed40f23afbbd826d6c1830 Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Tue, 11 Dec 2012 17:29:29 -0800 Subject: [PATCH 3/8] Fix "make dist" --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index ca8fdb7f2e..028012209a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,12 +7,12 @@ EXTRA_DIST = acinclude.m4 \ autogen.sh \ CHANGELOG \ configure.ac \ - cov_file_results.pl \ + cov_file_results.py \ Doxyfile \ INSTALL \ INSTALL.GNU \ Makefile.am \ - parse_cov_results.pl \ + parse_cov_results.py \ PBS_License.txt \ README.array_changes \ README.coding_notes \ @@ -23,7 +23,7 @@ EXTRA_DIST = acinclude.m4 \ README.trqauthd \ README.building_40 \ Release_Notes \ - run_report.pl \ + run_report.py \ torque.setup \ torque.spec \ buildutils/config.mk \ From c374b184e351a1969efd84ef9485300e4ec22bae Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Wed, 12 Dec 2012 12:06:26 -0800 Subject: [PATCH 4/8] Move loop to within queue_route() so that each queue has a single thread for routing its jobs. No mutex is needed this way. This keeps one queue from blocking other queues while preventing multiple queue_route() instances operating on the same queue at the same time. TODO: Must create new queue_route() thread for runtime-added queues. --- src/server/job_route.c | 76 +++++++++++---------- src/server/pbsd_main.c | 149 ++++++++++++++++++----------------------- 2 files changed, 107 insertions(+), 118 deletions(-) diff --git a/src/server/job_route.c b/src/server/job_route.c index 0da21a00e3..d450e280f9 100644 --- a/src/server/job_route.c +++ b/src/server/job_route.c @@ -134,6 +134,8 @@ extern char *msg_err_noqueue; extern int LOGLEVEL; extern pthread_mutex_t *reroute_job_mutex; +int route_retry_interval = 5; /* time in seconds to check routing queues */ + /* * Add an entry to the list of bad destinations for a job. * @@ -168,6 +170,7 @@ void add_dest( + /* * Check the job for a match of dest in the list of rejected destinations. * @@ -275,7 +278,7 @@ int default_router( if (is_bad_dest(jobp, destination)) continue; - switch (svr_movejob(jobp, destination, &local_errno, NULL, FALSE)) + switch (svr_movejob(jobp, destination, &local_errno, NULL, TRUE)) { case ROUTE_PERM_FAILURE: /* permanent failure */ @@ -488,7 +491,6 @@ int reroute_job( job_abt(&pjob, msg_routexceed); else if (rc == PBSE_QUENOEN) job_abt(&pjob, msg_err_noqueue); - } return(rc); @@ -530,48 +532,50 @@ void *queue_route( { sprintf(log_buf, "NULL queue name"); log_err(-1, __func__, log_buf); - pthread_exit(0); + return(NULL); } - if (LOGLEVEL>=7) - { - snprintf(log_buf, LOCAL_LOG_BUF_SIZE, "queue name: %s ", queue_name); - log_event(PBSEVENT_SYSTEM, PBS_EVENTCLASS_QUEUE, __func__, log_buf); - } - - - pthread_mutex_lock(reroute_job_mutex); - - pque = find_queuebyname(queue_name); - if (pque == NULL) + while (1) { - sprintf(log_buf, "Could not find queue %s", queue_name); - log_err(-1, __func__, log_buf); - free(queue_name); - pthread_mutex_unlock(reroute_job_mutex); - pthread_exit(0); - } + if (LOGLEVEL >= 7) + { + snprintf(log_buf, sizeof(log_buf), "queue name: %s", queue_name); + log_event(PBSEVENT_SYSTEM, PBS_EVENTCLASS_QUEUE, __func__, log_buf); + } + + pque = find_queuebyname(queue_name); + if (pque == NULL) + { + sprintf(log_buf, "Could not find queue %s", queue_name); + log_err(-1, __func__, log_buf); + free(queue_name); + pthread_mutex_unlock(reroute_job_mutex); + return(NULL); + } - while ((pjob = next_job(pque->qu_jobs,&iter)) != NULL) - { - /* the second condition says we only want to try if routing - * has been tried once - this is to let req_commit have the - * first crack at routing always */ - unlock_queue(pque, __func__, NULL, LOGLEVEL); - if ((pjob->ji_qs.ji_un.ji_routet.ji_rteretry <= time_now) && - (pjob->ji_qs.ji_un.ji_routet.ji_rteretry != 0)) + pthread_mutex_lock(reroute_job_mutex); + while ((pjob = next_job(pque->qu_jobs,&iter)) != NULL) { - reroute_job(pjob, pque); - unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL); + /* the second condition says we only want to try if routing + * has been tried once - this is to let req_commit have the + * first crack at routing always */ + unlock_queue(pque, __func__, (char *)NULL, 0); + if ((pjob->ji_qs.ji_un.ji_routet.ji_rteretry <= time_now - ROUTE_RETRY_TIME) && + (pjob->ji_qs.ji_un.ji_routet.ji_rteretry != 0)) + { + reroute_job(pjob, pque); + unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL); + } + else + unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL); } - else - unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL); - } + unlock_queue(pque, __func__, (char *)NULL, 0); + pthread_mutex_unlock(reroute_job_mutex); + sleep(route_retry_interval); + } free(queue_name); - unlock_queue(pque, __func__, NULL, LOGLEVEL); - pthread_mutex_unlock(reroute_job_mutex); - pthread_exit(0); + return(NULL); } /* END queue_route() */ diff --git a/src/server/pbsd_main.c b/src/server/pbsd_main.c index 3cc9bdb969..73782d707b 100644 --- a/src/server/pbsd_main.c +++ b/src/server/pbsd_main.c @@ -120,7 +120,6 @@ #include "tracking.h" #include "acct.h" #include "sched_cmds.h" -#include "rpp.h" #include "dis.h" #include "dis_init.h" #include "batch_request.h" @@ -258,7 +257,6 @@ int queue_rank = 0; int a_opt_init = -1; int wait_for_moms_hierarchy = FALSE; -int route_retry_interval = 10; /* time in seconds to check routing queues */ /* HA global data items */ long HALockCheckTime = 0; long HALockUpdateTime = 0; @@ -417,7 +415,7 @@ int process_pbs_server_port( if (rc != DIS_SUCCESS) { - log_err(-1, __func__, "Cannot read version - skipping this request.\n"); + log_err(-1, __func__, (char *)"Cannot read version - skipping this request.\n"); rc = PBSE_SOCKET_CLOSE; break; } @@ -806,7 +804,7 @@ void parse_command_line( } else { - log_err(-1, __func__, "unable to determine full server hostname"); + log_err(-1, __func__, (char *)"unable to determine full server hostname"); } exit(1); @@ -1116,14 +1114,14 @@ static int start_hot_jobs(void) PBSEVENT_SYSTEM, PBS_EVENTCLASS_JOB, pjob->ji_qs.ji_jobid, - "attempting to hot start job"); + (char *)"attempting to hot start job"); svr_startjob(pjob, NULL, NULL, NULL); ct++; } - unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL); + unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL); } return(ct); @@ -1148,6 +1146,8 @@ void send_any_hellos_needed() } /* END send_any_hellos_needed() */ + + void *handle_queue_routing_retries( void *vp) @@ -1156,46 +1156,26 @@ void *handle_queue_routing_retries( pbs_queue *pque; char *queuename; int iter = -1; - void *status; - pthread_t queue_route_thread_id = -1; - pthread_attr_t queue_route_attr; - - - if ((pthread_attr_init(&queue_route_attr)) != 0) - { - perror("pthread_attr_init failed. handle_queue_routing_retries not started"); - log_err(-1, msg_daemonname, "pthread_attr_init failed. handle_queue_routing_retries not started"); - return(NULL); - } - else if (pthread_attr_setdetachstate(&queue_route_attr, PTHREAD_CREATE_JOINABLE) != 0) - { - perror("pthread_attr_setdetachstate failed. handle_queue_routing_retries not started"); - log_err(-1, msg_daemonname, "pthread_attr_setdetachstate failed. handle_queue_routing_retries not started"); - return(NULL); - } - - while(1) + while ((pque = next_queue(&svr_queues, &iter)) != NULL) { - sleep(route_retry_interval); - while ((pque = next_queue(&svr_queues, &iter)) != NULL) + if (pque->qu_qs.qu_type == QTYPE_RoutePush) { - if (pque->qu_qs.qu_type == QTYPE_RoutePush) - { - queuename = strdup(pque->qu_qs.qu_name); /* make sure this gets freed inside queue_route */ - unlock_queue(pque, __func__, NULL, 0); - pthread_create(&queue_route_thread_id, &queue_route_attr, queue_route, queuename); - pthread_join(queue_route_thread_id, &status); - } - else - unlock_queue(pque, __func__, NULL, 0); + queuename = strdup(pque->qu_qs.qu_name); /* make sure this gets freed inside queue_route */ + enqueue_threadpool_request(queue_route, queuename); } + + unlock_queue(pque, __func__, (char *)NULL, 0); } return(NULL); } /* END handle_queue_routing_retries() */ + + + + void *handle_scheduler_contact( void *vp) @@ -1230,21 +1210,21 @@ void start_accept_thread() { pthread_attr_t accept_attr; + accept_thread_id = -1; if ((pthread_attr_init(&accept_attr)) != 0) { perror("pthread_attr_init failed. Could not start accept thread"); - log_err(-1, msg_daemonname,"pthread_attr_init failed. Could not start accept thread"); + log_err(-1, msg_daemonname,(char *)"pthread_attr_init failed. Could not start accept thread"); } else if ((pthread_attr_setdetachstate(&accept_attr, PTHREAD_CREATE_DETACHED) != 0)) { perror("pthread_attr_setdetatchedstate failed. Could not start accept thread"); - log_err(-1, msg_daemonname,"pthread_attr_setdetachedstate failed. Could not start accept thread"); + log_err(-1, msg_daemonname,(char *)"pthread_attr_setdetachedstate failed. Could not start accept thread"); } else if ((pthread_create(&accept_thread_id, &accept_attr, start_accept_listener, NULL)) != 0) { - accept_thread_id = -1; perror("could not start listener for pbs_server"); - log_err(-1, msg_daemonname, "Failed to start listener for pbs_server"); + log_err(-1, msg_daemonname, (char *)"Failed to start listener for pbs_server"); } } /* END start_accept_thread() */ @@ -1257,17 +1237,17 @@ void start_routing_retry_thread() if ((pthread_attr_init(&routing_attr)) != 0) { perror("pthread_attr_init failed. Could not start accept thread"); - log_err(-1, msg_daemonname,"pthread_attr_init failed. Could not start handle_queue_routing_retries"); + log_err(-1, msg_daemonname,(char *)"pthread_attr_init failed. Could not start handle_queue_routing_retries"); } else if ((pthread_attr_setdetachstate(&routing_attr, PTHREAD_CREATE_DETACHED) != 0)) { perror("pthread_attr_setdetatchedstate failed. Could not start accept thread"); - log_err(-1, msg_daemonname,"pthread_attr_setdetachedstate failed. Could not start handle_queue_routing_retries"); + log_err(-1, msg_daemonname,(char *)"pthread_attr_setdetachedstate failed. Could not start handle_queue_routing_retries"); } else if ((pthread_create(&route_retry_thread_id, &routing_attr, handle_queue_routing_retries, NULL)) != 0) { perror("could not start listener for pbs_server"); - log_err(-1, msg_daemonname, "Failed to start handle_queue_routing_retries"); + log_err(-1, msg_daemonname, (char *)"Failed to start handle_queue_routing_retries"); } } /* END start_routing_retry_thread() */ @@ -1283,17 +1263,17 @@ void start_exiting_retry_thread() if (pthread_attr_init(&attr) != 0) { perror("pthread_attr_init failed. Could not start exiting retry thread"); - log_err(-1, msg_daemonname,"pthread_attr_init failed. Could not start inspect_exiting_jobs"); + log_err(-1, msg_daemonname,(char *)"pthread_attr_init failed. Could not start inspect_exiting_jobs"); } else if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) != 0) { perror("pthread_attr_setdetatchedstate failed. Could not start exiting retry thread"); - log_err(-1, msg_daemonname,"pthread_attr_setdetachedstate failed. Could not start inspect_exiting_jobs"); + log_err(-1, msg_daemonname,(char *)"pthread_attr_setdetachedstate failed. Could not start inspect_exiting_jobs"); } else if (pthread_create(&exiting_thread, &attr, inspect_exiting_jobs, NULL) != 0) { perror("could not start exiting job retry thread for pbs_server"); - log_err(-1, msg_daemonname, "Failed to start inspect_exiting_jobs"); + log_err(-1, msg_daemonname, (char *)"Failed to start inspect_exiting_jobs"); } } /* END start_exiting_retry_thread() */ @@ -1368,18 +1348,18 @@ void main_loop(void) /* for large systems, give newly reported nodes more time before being marked down while pbs_moms are initialy reporting in */ - set_task(WORK_Timed, when + svr_totnodes / 12, check_nodes, NULL, FALSE); + set_task(WORK_Timed, when + svr_totnodes / 12, check_nodes, (char *)NULL, FALSE); } else { - set_task(WORK_Timed, when, check_nodes, NULL, FALSE); + set_task(WORK_Timed, when, check_nodes, (char *)NULL, FALSE); } /* Just check the nodes with check_nodes above and don't ping anymore. */ - set_task(WORK_Timed, time_now + 5, check_log, NULL, FALSE); + set_task(WORK_Timed, time_now + 5, check_log, (char *)NULL, FALSE); - set_task(WORK_Timed,time_now + 10,check_acct_log, NULL, FALSE); + set_task(WORK_Timed,time_now + 10,check_acct_log, (char *)NULL, FALSE); /* * Now at last, we are ready to do some batch work. The @@ -1553,7 +1533,7 @@ void main_loop(void) if (pjob->ji_modified) job_save(pjob, SAVEJOB_FULL, 0); - unlock_ji_mutex(pjob, __func__, "1", LOGLEVEL); + unlock_ji_mutex(pjob, __func__, (char *)"1", LOGLEVEL); } if (svr_chngNodesfile) @@ -1894,7 +1874,7 @@ int main( if (write(lockfds, log_buf, strlen(log_buf)) != (ssize_t)strlen(log_buf)) { - log_err(errno, msg_daemonname, "failed to write pid to lockfile"); + log_err(errno, msg_daemonname, (char *)"failed to write pid to lockfile"); exit(-1); } @@ -1931,7 +1911,7 @@ int main( /* NOTE: env cleared in pbsd_init() */ if (pbsd_init(server_init_type) != PBSE_NONE) { - log_err(-1, msg_daemonname, "pbsd_init failed"); + log_err(-1, msg_daemonname, (char *)"pbsd_init failed"); exit(3); } @@ -1955,7 +1935,7 @@ int main( { perror("pbs_server: unix domain socket"); - log_err(-1, msg_daemonname, "init_network failed unix domain socket"); + log_err(-1, msg_daemonname, (char *)"init_network failed unix domain socket"); exit(3); } @@ -1967,7 +1947,7 @@ int main( if (poll_job_task_mutex == NULL) { perror("pbs_server: failed to initialize poll_job_task_mutex"); - log_err(-1, msg_daemonname, "pbs_server: failed to initialize poll_job_task_mutex"); + log_err(-1, msg_daemonname, (char *)"pbs_server: failed to initialize poll_job_task_mutex"); exit(3); } @@ -2045,7 +2025,7 @@ void check_job_log( if (log_remove_old(path_jobinfo_log, keep_days * SECS_PER_DAY) != 0) { - log_err(-1,"check_job_log","failure occurred when checking for old job logs"); + log_err(-1,"check_job_log",(char *)"failure occurred when checking for old job logs"); } } @@ -2060,7 +2040,7 @@ void check_job_log( PBSEVENT_SYSTEM | PBSEVENT_FORCE, PBS_EVENTCLASS_SERVER, msg_daemonname, - "Rolling job log file"); + (char *)"Rolling job log file"); if (roll_depth != -1) { @@ -2069,7 +2049,7 @@ void check_job_log( if ((depth >= INT_MAX) || (depth < 1)) { - log_err(-1, "check_job_log", "job log roll cancelled, logfile depth is out of range"); + log_err(-1, "check_job_log", (char *)"job log roll cancelled, logfile depth is out of range"); } else { @@ -2081,7 +2061,7 @@ void check_job_log( free(ptask->wt_mutex); free(ptask); - set_task(WORK_Timed, time_now + PBS_LOG_CHECK_RATE, check_job_log, NULL, FALSE); + set_task(WORK_Timed, time_now + PBS_LOG_CHECK_RATE, check_job_log, (char *)NULL, FALSE); } /* END check_job_log */ @@ -2113,7 +2093,7 @@ void check_log( if (log_remove_old(path_svrlog, keep_days * SECS_PER_DAY) != 0) { - log_err(-1,"check_log","failure occurred when checking for old pbs_server logs"); + log_err(-1,"check_log",(char *)"failure occurred when checking for old pbs_server logs"); } } @@ -2128,13 +2108,13 @@ void check_log( PBSEVENT_SYSTEM | PBSEVENT_FORCE, PBS_EVENTCLASS_SERVER, msg_daemonname, - "Rolling log file"); + (char *)"Rolling log file"); get_svr_attr_l(SRV_ATR_LogFileRollDepth, &roll_depth); if ((roll_depth >= INT_MAX) || (roll_depth < 1)) { - log_err(-1, "check_log", "log roll cancelled, logfile depth is out of range"); + log_err(-1, "check_log", (char *)"log roll cancelled, logfile depth is out of range"); } else { @@ -2157,7 +2137,7 @@ void check_log( free(ptask->wt_mutex); free(ptask); - set_task(WORK_Timed, time_now + PBS_LOG_CHECK_RATE, check_log, NULL, FALSE); + set_task(WORK_Timed, time_now + PBS_LOG_CHECK_RATE, check_log, (char *)NULL, FALSE); return; } /* END check_log */ @@ -2192,7 +2172,7 @@ void check_acct_log( free(ptask->wt_mutex); free(ptask); - set_task(WORK_Timed,time_now + PBS_ACCT_CHECK_RATE,check_acct_log,NULL,FALSE); + set_task(WORK_Timed,time_now + PBS_ACCT_CHECK_RATE,check_acct_log,(char *)NULL,FALSE); return; } /* END check_acct_log */ @@ -2357,7 +2337,7 @@ int is_ha_lock_file_valid( if (GoodPermissions == FALSE) { - log_err(-1, __func__, "could not obtain the needed permissions for the lock file"); + log_err(-1, __func__, (char *)"could not obtain the needed permissions for the lock file"); } return(GoodPermissions); @@ -2649,7 +2629,7 @@ int start_update_ha_lock_thread() if (fds < 0) { - log_err(-1, __func__, "Couldn't write the pid to the lockfile\n"); + log_err(-1, __func__, (char *)"Couldn't write the pid to the lockfile\n"); return(FAILURE); } @@ -2657,7 +2637,7 @@ int start_update_ha_lock_thread() snprintf(smallBuf,sizeof(smallBuf),"%ld\n",(long)sid); if (write(fds,smallBuf,strlen(smallBuf)) != (ssize_t)strlen(smallBuf)) { - log_err(-1, __func__, "Couldn't write the pid to the lockfile\n"); + log_err(-1, __func__, (char *)"Couldn't write the pid to the lockfile\n"); close(fds); return(FAILURE); @@ -2666,7 +2646,12 @@ int start_update_ha_lock_thread() /* we don't need an open handle on the lockfile, just correct update times */ close(fds); - pthread_attr_init(&HALockThreadAttr); + if ((rc = pthread_attr_init(&HALockThreadAttr)) != 0) + { + perror("pthread_attr_init failed. Could not start update ha lock thread"); + log_err(-1, msg_daemonname,"pthread_attr_init failed. Could not start ha lock thread"); + return FAILURE; + } rc = pthread_create(&HALockThread,&HALockThreadAttr,update_ha_lock_thread,NULL); @@ -2674,7 +2659,7 @@ int start_update_ha_lock_thread() { /* error creating thread */ - log_err(-1, __func__, "Could not create HA Lock Thread\n"); + log_err(-1, __func__, (char *)"Could not create HA Lock Thread\n"); return(FAILURE); } @@ -2698,7 +2683,7 @@ int mutex_lock( { if (pthread_mutex_lock(Mutex) != 0) { - log_err(-1,"mutex_lock","ALERT: cannot lock mutex!\n"); + log_err(-1,"mutex_lock",(char *)"ALERT: cannot lock mutex!\n"); return(FAILURE); } @@ -2716,7 +2701,7 @@ int mutex_unlock( { if (pthread_mutex_unlock(Mutex) != 0) { - log_err(-1,"mutex_unlock","ALERT: cannot unlock mutex!\n"); + log_err(-1,"mutex_unlock",(char *)"ALERT: cannot unlock mutex!\n"); return(FAILURE); } @@ -2772,7 +2757,7 @@ static void lock_out_ha() { /* try to get a filesystem lock on the "mutex" file */ - while (acquire_file_lock(MutexLockFile,&MutexLockFD,"HA") == FAILURE) + while (acquire_file_lock(MutexLockFile,&MutexLockFD, (char *)"HA") == FAILURE) { sprintf(log_buf,"Could not acquire HA flock--trying again in 1 second\n"); @@ -2852,7 +2837,7 @@ static void lock_out_ha() PBSEVENT_SYSTEM, PBS_EVENTCLASS_SERVER, __func__, - "high availability file lock obtained"); + (char *)"high availability file lock obtained"); } /* END lock_out_ha() */ @@ -2893,7 +2878,7 @@ static int daemonize_server( if ((pid = fork()) == -1) { - log_err(errno, __func__, "cannot fork into background"); + log_err(errno, __func__, (char *)"cannot fork into background"); return(FAILURE); } @@ -2907,7 +2892,7 @@ static int daemonize_server( PBSEVENT_SYSTEM, PBS_EVENTCLASS_SERVER, __func__, - "INFO: parent is exiting"); + (char *)"INFO: parent is exiting"); exit(0); } @@ -2916,7 +2901,7 @@ static int daemonize_server( if ((*sid = setsid()) == -1) { - log_err(errno, __func__, "Could not disconnect from controlling terminal"); + log_err(errno, __func__, (char *)"Could not disconnect from controlling terminal"); return(FAILURE); } @@ -2938,7 +2923,7 @@ static int daemonize_server( if ((pid = fork()) == -1) { - log_err(errno, __func__, "cannot fork into background"); + log_err(errno, __func__, (char *)"cannot fork into background"); return(FAILURE); } @@ -2951,7 +2936,7 @@ static int daemonize_server( PBSEVENT_SYSTEM, PBS_EVENTCLASS_SERVER, __func__, - "INFO: parent is exiting"); + (char *)"INFO: parent is exiting"); exit(0); } @@ -2964,7 +2949,7 @@ static int daemonize_server( PBSEVENT_SYSTEM, PBS_EVENTCLASS_SERVER, __func__, - "INFO: child process in background"); + (char *)"INFO: child process in background"); return(SUCCESS); } /* END daemonize_server() */ @@ -3084,7 +3069,7 @@ int get_full_path( { char *TokPtr = NULL; - char *Delims = ":;"; /* windows and unix path deliminators */ + char *Delims = (char *)":;"; /* windows and unix path deliminators */ char *PathLocation; char tmpPath[MAX_LINE]; bool_t IsExe = FALSE; @@ -3192,13 +3177,13 @@ int svr_restart() { free(ArgV[0]); - ArgV[0] = calloc(sizeof(char), (strlen(FullCmd) + 1)); + ArgV[0] = (char *)calloc(sizeof(char), (strlen(FullCmd) + 1)); if (ArgV[0] == NULL) { /* could not calloc */ - log_err(errno, __func__, "ERROR: cannot allocate memory for full command, cannot restart\n"); + log_err(errno, __func__, (char *)"ERROR: (char *) cannot allocate memory for full command, cannot restart\n"); exit(-10); } From 39f4862197b2a10593453ece302ed568380c7838 Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Fri, 14 Dec 2012 16:20:01 -0800 Subject: [PATCH 5/8] Fix "make dist" and "make distcheck" and copy over .gitignore to this branch. --- .gitignore | 449 ++++++++++++++++++++++++++++++++++ Makefile.am | 6 +- src/server/Makefile.am | 2 +- src/tools/xpbsmon/Makefile.am | 2 +- 4 files changed, 454 insertions(+), 5 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..794442400c --- /dev/null +++ b/.gitignore @@ -0,0 +1,449 @@ +# Ignore objects and archives. +*.[oa] +Makefile +Makefile.in +*.l[oa] +*.gcno +coverage_run.sh +*.gcov +*.gcda +*_suite.log +.deps +.libs +*.m4 +autom4te.cache/ +buildutils/config.guess +buildutils/config.sub +buildutils/depcomp +buildutils/install-sh +buildutils/ltmain.sh +buildutils/missing +buildutils/modulefiles +buildutils/modulefiles.vers +buildutils/pbs_mkdirs +buildutils/self-extract-head-sh +buildutils/ylwrap +config.log +config.status +configure +contrib/blcr/checkpoint_script +contrib/blcr/restart_script +contrib/init.d/debian.pbs_mom +contrib/init.d/debian.pbs_sched +contrib/init.d/debian.pbs_server +contrib/init.d/debian.trqauthd +contrib/init.d/pbs_mom +contrib/init.d/pbs_sched +contrib/init.d/pbs_server +contrib/init.d/trqauthd +contrib/init.d/suse.pbs_mom +contrib/init.d/suse.pbs_sched +contrib/init.d/suse.pbs_server +contrib/init.d/suse.trqauthd +*.1 +*.3 +*.7 +*.8 +doc/soelim +libtool +pbs-config +src/cmds/nqs2pbs +src/cmds/pbs_track +src/cmds/pbsdsh +src/cmds/pbsnodes +src/cmds/qalter +src/cmds/qchkpt +src/cmds/qdel +src/cmds/qdisable +src/cmds/qenable +src/cmds/qgpumode +src/cmds/qgpureset +src/cmds/qhold +src/cmds/qmgr +src/cmds/qmove +src/cmds/qmsg +src/cmds/qorder +src/cmds/qrerun +src/cmds/qrls +src/cmds/qrun +src/cmds/qselect +src/cmds/qsig +src/cmds/qstart +src/cmds/qstat +src/cmds/qstop +src/cmds/qsub +src/cmds/qterm +src/daemon_client/trqauthd +src/drmaa/Doxyfile +src/include/pbs_config.h* +src/include/site_job_attr_def.h +src/include/site_job_attr_enum.h +src/include/site_qmgr_node_print.h +src/include/site_qmgr_que_print.h +src/include/site_qmgr_svr_print.h +src/include/site_que_attr_def.h +src/include/site_que_attr_enum.h +src/include/site_svr_attr_def.h +src/include/site_svr_attr_enum.h +src/include/stamp-h1 +src/momctl/momctl +src/resmom/pbs_demux +src/resmom/pbs_mom +src/scheduler.cc/pbs_sched +*.swp +src/server/pbs_server +src/tools/chk_tree +src/tools/hostn +src/tools/pbs_tclsh +src/tools/printjob +src/tools/printserverdb +src/tools/printtracking +src/tools/tracejob +tags +torque.spec +src/cmds/test/MXML/test_MXML +src/cmds/test/common_cmds/test_common_cmds +src/cmds/test/pbs_track/test_pbs_track +src/cmds/test/pbsdsh/test_pbsdsh +src/cmds/test/pbsnodes/test_pbsnodes +src/cmds/test/pbspd/test_pbspd +src/cmds/test/pbspoe/test_pbspoe +src/cmds/test/qalter/test_qalter +src/cmds/test/qchkpt/test_qchkpt +src/cmds/test/qdel/test_qdel +src/cmds/test/qdisable/test_qdisable +src/cmds/test/qenable/test_qenable +src/cmds/test/qgpumode/test_qgpumode +src/cmds/test/qgpureset/test_qgpureset +src/cmds/test/qhold/test_qhold +src/cmds/test/qmgr/test_qmgr +src/cmds/test/qmove/test_qmove +src/cmds/test/qmsg/test_qmsg +src/cmds/test/qorder/test_qorder +src/cmds/test/qrerun/test_qrerun +src/cmds/test/qrls/test_qrls +src/cmds/test/qrun/test_qrun +src/cmds/test/qselect/test_qselect +src/cmds/test/qsig/test_qsig +src/cmds/test/qstart/test_qstart +src/cmds/test/qstat/test_qstat +src/cmds/test/qstop/test_qstop +src/cmds/test/qsub_functions/build_test_files.sh +src/cmds/test/qsub_functions/test_x11_get_proto +src/cmds/test/qterm/test_qterm +src/daemon_client/test/trq_auth_daemon/test_trq_auth_daemon +src/lib/Libattr/test/attr_atomic/test_attr_atomic +src/lib/Libattr/test/attr_fn_acl/test_attr_fn_acl +src/lib/Libattr/test/attr_fn_arst/test_attr_fn_arst +src/lib/Libattr/test/attr_fn_b/test_attr_fn_b +src/lib/Libattr/test/attr_fn_c/test_attr_fn_c +src/lib/Libattr/test/attr_fn_hold/test_attr_fn_hold +src/lib/Libattr/test/attr_fn_intr/test_attr_fn_intr +src/lib/Libattr/test/attr_fn_l/test_attr_fn_l +src/lib/Libattr/test/attr_fn_ll/test_attr_fn_ll +src/lib/Libattr/test/attr_fn_resc/test_attr_fn_resc +src/lib/Libattr/test/attr_fn_size/test_attr_fn_size +src/lib/Libattr/test/attr_fn_str/test_attr_fn_str +src/lib/Libattr/test/attr_fn_time/test_attr_fn_time +src/lib/Libattr/test/attr_fn_tokens/test_attr_fn_tokens +src/lib/Libattr/test/attr_fn_tv/test_attr_fn_tv +src/lib/Libattr/test/attr_fn_unkn/test_attr_fn_unkn +src/lib/Libattr/test/attr_func/test_attr_func +src/lib/Libattr/test/attr_node_func/test_attr_node_func +src/lib/Libcmds/test/add_verify_resources/test_add_verify_resources +src/lib/Libcmds/test/ck_job_name/test_ck_job_name +src/lib/Libcmds/test/cnt2server/test_cnt2server +src/lib/Libcmds/test/cvtdate/test_cvtdate +src/lib/Libcmds/test/get_server/test_get_server +src/lib/Libcmds/test/locate_job/test_locate_job +src/lib/Libcmds/test/parse_at/test_parse_at +src/lib/Libcmds/test/parse_depend/test_parse_depend +src/lib/Libcmds/test/parse_destid/test_parse_destid +src/lib/Libcmds/test/parse_equal/test_parse_equal +src/lib/Libcmds/test/parse_jobid/test_parse_jobid +src/lib/Libcmds/test/parse_stage/test_parse_stage +src/lib/Libcmds/test/prepare_path/test_prepare_path +src/lib/Libcmds/test/prt_job_err/test_prt_job_err +src/lib/Libcmds/test/set_attr/test_set_attr +src/lib/Libcmds/test/set_resource/test_set_resource +src/lib/Libcsv/test/csv/test_csv +src/lib/Libdis/test/discui_/test_discui_ +src/lib/Libdis/test/discul_/test_discul_ +src/lib/Libdis/test/disi10d_/test_disi10d_ +src/lib/Libdis/test/disi10l_/test_disi10l_ +src/lib/Libdis/test/disiui_/test_disiui_ +src/lib/Libdis/test/disp10d_/test_disp10d_ +src/lib/Libdis/test/disp10l_/test_disp10l_ +src/lib/Libdis/test/disrcs/test_disrcs +src/lib/Libdis/test/disrd/test_disrd +src/lib/Libdis/test/disrf/test_disrf +src/lib/Libdis/test/disrfcs/test_disrfcs +src/lib/Libdis/test/disrfst/test_disrfst +src/lib/Libdis/test/disrl/test_disrl +src/lib/Libdis/test/disrl_/test_disrl_ +src/lib/Libdis/test/disrsc/test_disrsc +src/lib/Libdis/test/disrsi/test_disrsi +src/lib/Libdis/test/disrsi_/test_disrsi_ +src/lib/Libdis/test/disrsl/test_disrsl +src/lib/Libdis/test/disrsl_/test_disrsl_ +src/lib/Libdis/test/disrss/test_disrss +src/lib/Libdis/test/disrst/test_disrst +src/lib/Libdis/test/disruc/test_disruc +src/lib/Libdis/test/disrui/test_disrui +src/lib/Libdis/test/disrul/test_disrul +src/lib/Libdis/test/disrus/test_disrus +src/lib/Libdis/test/diswcs/test_diswcs +src/lib/Libdis/test/diswf/test_diswf +src/lib/Libdis/test/diswl_/test_diswl_ +src/lib/Libdis/test/diswsi/test_diswsi +src/lib/Libdis/test/diswsl/test_diswsl +src/lib/Libdis/test/diswui/test_diswui +src/lib/Libdis/test/diswui_/test_diswui_ +src/lib/Libdis/test/diswul/test_diswul +src/lib/Libifl/test/PBSD_gpuctrl2/test_PBSD_gpuctrl2 +src/lib/Libifl/test/PBSD_manage2/test_PBSD_manage2 +src/lib/Libifl/test/PBSD_manager_caps/test_PBSD_manager_caps +src/lib/Libifl/test/PBSD_msg2/test_PBSD_msg2 +src/lib/Libifl/test/PBSD_rdrpy/test_PBSD_rdrpy +src/lib/Libifl/test/PBSD_sig2/test_PBSD_sig2 +src/lib/Libifl/test/PBSD_status/test_PBSD_status +src/lib/Libifl/test/PBSD_status2/test_PBSD_status2 +src/lib/Libifl/test/PBSD_submit_caps/test_PBSD_submit_caps +src/lib/Libifl/test/PBS_attr/test_PBS_attr +src/lib/Libifl/test/dec_Authen/test_dec_Authen +src/lib/Libifl/test/dec_CpyFil/test_dec_CpyFil +src/lib/Libifl/test/dec_Gpu/test_dec_Gpu +src/lib/Libifl/test/dec_JobCred/test_dec_JobCred +src/lib/Libifl/test/dec_JobFile/test_dec_JobFile +src/lib/Libifl/test/dec_JobId/test_dec_JobId +src/lib/Libifl/test/dec_JobObit/test_dec_JobObit +src/lib/Libifl/test/dec_Manage/test_dec_Manage +src/lib/Libifl/test/dec_MoveJob/test_dec_MoveJob +src/lib/Libifl/test/dec_MsgJob/test_dec_MsgJob +src/lib/Libifl/test/dec_QueueJob/test_dec_QueueJob +src/lib/Libifl/test/dec_Reg/test_dec_Reg +src/lib/Libifl/test/dec_ReqExt/test_dec_ReqExt +src/lib/Libifl/test/dec_ReqHdr/test_dec_ReqHdr +src/lib/Libifl/test/dec_Resc/test_dec_Resc +src/lib/Libifl/test/dec_ReturnFile/test_dec_ReturnFile +src/lib/Libifl/test/dec_RunJob/test_dec_RunJob +src/lib/Libifl/test/dec_Shut/test_dec_Shut +src/lib/Libifl/test/dec_Sig/test_dec_Sig +src/lib/Libifl/test/dec_Status/test_dec_Status +src/lib/Libifl/test/dec_Track/test_dec_Track +src/lib/Libifl/test/dec_attrl/test_dec_attrl +src/lib/Libifl/test/dec_attropl/test_dec_attropl +src/lib/Libifl/test/dec_rpyc/test_dec_rpyc +src/lib/Libifl/test/dec_rpys/test_dec_rpys +src/lib/Libifl/test/dec_svrattrl/test_dec_svrattrl +src/lib/Libifl/test/enc_CpyFil/test_enc_CpyFil +src/lib/Libifl/test/enc_Gpu/test_enc_Gpu +src/lib/Libifl/test/enc_JobCred/test_enc_JobCred +src/lib/Libifl/test/enc_JobFile/test_enc_JobFile +src/lib/Libifl/test/enc_JobId/test_enc_JobId +src/lib/Libifl/test/enc_JobObit/test_enc_JobObit +src/lib/Libifl/test/enc_Manage/test_enc_Manage +src/lib/Libifl/test/enc_MoveJob/test_enc_MoveJob +src/lib/Libifl/test/enc_MsgJob/test_enc_MsgJob +src/lib/Libifl/test/enc_QueueJob/test_enc_QueueJob +src/lib/Libifl/test/enc_QueueJob_hash/test_enc_QueueJob_hash +src/lib/Libifl/test/enc_Reg/test_enc_Reg +src/lib/Libifl/test/enc_ReqExt/test_enc_ReqExt +src/lib/Libifl/test/enc_ReqHdr/test_enc_ReqHdr +src/lib/Libifl/test/enc_ReturnFile/test_enc_ReturnFile +src/lib/Libifl/test/enc_RunJob/test_enc_RunJob +src/lib/Libifl/test/enc_Shut/test_enc_Shut +src/lib/Libifl/test/enc_Sig/test_enc_Sig +src/lib/Libifl/test/enc_Status/test_enc_Status +src/lib/Libifl/test/enc_Track/test_enc_Track +src/lib/Libifl/test/enc_attrl/test_enc_attrl +src/lib/Libifl/test/enc_attropl/test_enc_attropl +src/lib/Libifl/test/enc_attropl_hash/test_enc_attropl_hash +src/lib/Libifl/test/enc_reply/test_enc_reply +src/lib/Libifl/test/enc_svrattrl/test_enc_svrattrl +src/lib/Libifl/test/get_svrport/test_get_svrport +src/lib/Libifl/test/list_link/test_list_link +src/lib/Libifl/test/nonblock/test_nonblock +src/lib/Libifl/test/pbsD_alterjo/test_pbsD_alterjo +src/lib/Libifl/test/pbsD_asyrun/test_pbsD_asyrun +src/lib/Libifl/test/pbsD_chkptjob/test_pbsD_chkptjob +src/lib/Libifl/test/pbsD_connect/test_pbsD_connect +src/lib/Libifl/test/pbsD_deljob/test_pbsD_deljob +src/lib/Libifl/test/pbsD_gpuctrl/test_pbsD_gpuctrl +src/lib/Libifl/test/pbsD_holdjob/test_pbsD_holdjob +src/lib/Libifl/test/pbsD_locjob/test_pbsD_locjob +src/lib/Libifl/test/pbsD_manager/test_pbsD_manager +src/lib/Libifl/test/pbsD_movejob/test_pbsD_movejob +src/lib/Libifl/test/pbsD_msgjob/test_pbsD_msgjob +src/lib/Libifl/test/pbsD_orderjo/test_pbsD_orderjo +src/lib/Libifl/test/pbsD_rerunjo/test_pbsD_rerunjo +src/lib/Libifl/test/pbsD_resc/test_pbsD_resc +src/lib/Libifl/test/pbsD_rlsjob/test_pbsD_rlsjob +src/lib/Libifl/test/pbsD_runjob/test_pbsD_runjob +src/lib/Libifl/test/pbsD_selectj/test_pbsD_selectj +src/lib/Libifl/test/pbsD_sigjob/test_pbsD_sigjob +src/lib/Libifl/test/pbsD_stagein/test_pbsD_stagein +src/lib/Libifl/test/pbsD_statjob/test_pbsD_statjob +src/lib/Libifl/test/pbsD_statnode/test_pbsD_statnode +src/lib/Libifl/test/pbsD_statque/test_pbsD_statque +src/lib/Libifl/test/pbsD_statsrv/test_pbsD_statsrv +src/lib/Libifl/test/pbsD_submit/test_pbsD_submit +src/lib/Libifl/test/pbsD_submit_hash/test_pbsD_submit_hash +src/lib/Libifl/test/pbsD_termin/test_pbsD_termin +src/lib/Libifl/test/pbs_geterrmg/test_pbs_geterrmg +src/lib/Libifl/test/pbs_statfree/test_pbs_statfree +src/lib/Libifl/test/tcp_dis/test_tcp_dis +src/lib/Libifl/test/tm/test_tm +src/lib/Libifl/test/torquecfg/test_torquecfg +src/lib/Libifl/test/trq_auth/test_trq_auth +src/lib/Liblog/test/chk_file_sec/test_chk_file_sec +src/lib/Liblog/test/log_event/test_log_event +src/lib/Liblog/test/pbs_log/test_pbs_log +src/lib/Liblog/test/pbs_messages/test_pbs_messages +src/lib/Liblog/test/setup_env/test_setup_env +src/lib/Libnet/test/conn_table/test_conn_table +src/lib/Libnet/test/get_hostaddr/test_get_hostaddr +src/lib/Libnet/test/get_hostname/test_get_hostname +src/lib/Libnet/test/md5/test_md5 +src/lib/Libnet/test/net_client/test_net_client +src/lib/Libnet/test/net_common/test_net_common +src/lib/Libnet/test/net_server/test_net_server +src/lib/Libnet/test/net_set_clse/test_net_set_clse +src/lib/Libnet/test/port_forwarding/test_port_forwarding +src/lib/Libnet/test/rm/test_rm +src/lib/Libnet/test/server_core/test_server_core +src/lib/Libsite/test/site_allow_u/test_site_allow_u +src/lib/Libsite/test/site_alt_rte/test_site_alt_rte +src/lib/Libsite/test/site_check_u/test_site_check_u +src/lib/Libsite/test/site_map_usr/test_site_map_usr +src/lib/Libsite/test/site_mom_chu/test_site_mom_chu +src/lib/Libsite/test/site_mom_ckp/test_site_mom_ckp +src/lib/Libsite/test/site_mom_jst/test_site_mom_jst +src/lib/Libutils/test/u_MXML/test_u_MXML +src/lib/Libutils/test/u_dynamic_string/test_u_dynamic_string +src/lib/Libutils/test/u_groups/test_u_groups +src/lib/Libutils/test/u_hash_map_structs/ct_u_hash_map_structs +src/lib/Libutils/test/u_hash_table/test_u_hash_table +src/lib/Libutils/test/u_lock_ctl/test_u_lock_ctl +src/lib/Libutils/test/u_memmgr/test_u_memmgr +src/lib/Libutils/test/u_mom_hierarchy/test_u_mom_hierarchy +src/lib/Libutils/test/u_mu/test_u_mu +src/lib/Libutils/test/u_resizable_array/test_u_resizable_array +src/lib/Libutils/test/u_threadpool/test_u_threadpool +src/lib/Libutils/test/u_tree/test_u_tree +src/lib/Libutils/test/u_users/test_u_users +src/lib/Libutils/test/u_xml/test_u_xml +src/momctl/test/momctl/test_momctl +src/resmom/linux/test/mom_mach/test_mom_mach +src/resmom/linux/test/mom_start/test_mom_start +src/resmom/linux/test/pe_input/test_pe_input +src/resmom/test/alps_reservations/test_alps_reservations +src/resmom/test/catch_child/1.sysname.ac.JB +src/resmom/test/catch_child/2.sysname.ac.JB +src/resmom/test/catch_child/3.sysname.ac.JB +src/resmom/test/catch_child/build_test_files.sh +src/resmom/test/catch_child/test_catch_child +src/resmom/test/catch_child/test_exit_mom_job +src/resmom/test/catch_child/test_get_node +src/resmom/test/catch_child/test_init_abort_jobs +src/resmom/test/catch_child/test_mom_deljob +src/resmom/test/catch_child/test_obit_reply +src/resmom/test/catch_child/test_post_epilogue +src/resmom/test/catch_child/test_preobit_reply +src/resmom/test/catch_child/test_scan_for_exiting +src/resmom/test/checkpoint/test_checkpoint +src/resmom/test/generate_alps_status/test_generate_alps_status +src/resmom/test/mom_comm/test_mom_comm +src/resmom/test/mom_inter/test_mom_inter +src/resmom/test/mom_job_func/test_mom_job_func +src/resmom/test/mom_main/test_mom_main +src/resmom/test/mom_process_request/test_mom_process_request +src/resmom/test/mom_req_quejob/test_mom_req_quejob +src/resmom/test/mom_server/test_mom_server +src/resmom/test/pbs_demux/test_pbs_demux +src/resmom/test/prolog/test_prolog +src/resmom/test/release_reservation/test_release_reservation +src/resmom/test/requests/test_requests +src/resmom/test/start_exec/test_start_exec +src/resmom/test/tmsock_recov/test_tmsock_recov +src/server/test/accounting/test_accounting +src/server/test/array_func/test_array_func +src/server/test/array_upgrade/test_array_upgrade +src/server/test/attr_recov/test_attr_recov +src/server/test/batch_request/test_batch_request +src/server/test/dis_read/test_dis_read +src/server/test/display_alps_status/test_display_alps_status +src/server/test/exiting_jobs/test_exiting_jobs +src/server/test/geteusernam/test_geteusernam +src/server/test/issue_request/test_issue_request +src/server/test/job_container/test_job_container +src/server/test/job_func/test_job_func +src/server/test/job_func/test_record_jobinfo +src/server/test/job_qs_upgrade/test_job_qs_upgrade +src/server/test/job_recov/test_job_recov +src/server/test/job_recycler/test_job_recycler +src/server/test/job_route/test_job_route +src/server/test/login_nodes/test_login_nodes +src/server/test/node_func/test_node_func +src/server/test/node_manager/test_node_manager +src/server/test/pbsd_init/test_pbsd_init +src/server/test/pbsd_main/test_pbsd_main +src/server/test/process_alps_status/test_process_alps_status +src/server/test/process_mom_update/test_process_mom_update +src/server/test/process_request/test_process_request +src/server/test/queue_func/test_queue_func +src/server/test/queue_recov/test_queue_recov +src/server/test/receive_mom_communication/test_receive_mom_communication +src/server/test/reply_send/test_reply_send +src/server/test/req_delete/test_req_delete +src/server/test/req_deletearray/test_req_deletearray +src/server/test/req_getcred/test_req_getcred +src/server/test/req_gpuctrl/test_req_gpuctrl +src/server/test/req_holdarray/test_req_holdarray +src/server/test/req_holdjob/test_req_holdjob +src/server/test/req_jobobit/test_req_jobobit +src/server/test/req_locate/test_req_locate +src/server/test/req_manager/test_req_manager +src/server/test/req_message/test_req_message +src/server/test/req_modify/test_req_modify +src/server/test/req_movejob/test_req_movejob +src/server/test/req_quejob/test_req_quejob +src/server/test/req_register/test_req_register +src/server/test/req_rerun/test_req_rerun +src/server/test/req_rescq/test_req_rescq +src/server/test/req_runjob/test_req_runjob +src/server/test/req_select/test_req_select +src/server/test/req_shutdown/test_req_shutdown +src/server/test/req_signal/test_req_signal +src/server/test/req_stat/test_req_stat +src/server/test/req_tokens/test_req_tokens +src/server/test/req_track/test_req_track +src/server/test/resc_def_all/test_resc_def_all +src/server/test/run_sched/test_run_sched +src/server/test/stat_job/test_stat_job +src/server/test/svr_chk_owner/test_svr_chk_owner +src/server/test/svr_connect/test_svr_connect +src/server/test/svr_format_job/test_svr_format_job +src/server/test/svr_func/test_svr_func +src/server/test/svr_jobfunc/test_svr_jobfunc +src/server/test/svr_mail/test_svr_mail +src/server/test/svr_movejob/test_svr_movejob +src/server/test/svr_recov/test_svr_recov +src/server/test/svr_resccost/test_svr_resccost +src/server/test/svr_task/test_svr_task +src/server/test/track_alps_reservations/test_track_alps_reservations +src/server/test/user_info/test_user_info +src/tools/test/chk_tree/test_chk_tree +src/tools/test/hostn/test_hostn +src/tools/test/pbsTclInit/test_pbsTclInit +src/tools/test/printjob/test_printjob +src/tools/test/printserverdb/test_printserverdb +src/tools/test/printtracking/test_printtracking +src/tools/test/tracejob/test_tracejob +.project +.cproject +cscope.out +*.orig +*.rej +*.patch +coverage_results.file diff --git a/Makefile.am b/Makefile.am index 028012209a..ca8fdb7f2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,12 +7,12 @@ EXTRA_DIST = acinclude.m4 \ autogen.sh \ CHANGELOG \ configure.ac \ - cov_file_results.py \ + cov_file_results.pl \ Doxyfile \ INSTALL \ INSTALL.GNU \ Makefile.am \ - parse_cov_results.py \ + parse_cov_results.pl \ PBS_License.txt \ README.array_changes \ README.coding_notes \ @@ -23,7 +23,7 @@ EXTRA_DIST = acinclude.m4 \ README.trqauthd \ README.building_40 \ Release_Notes \ - run_report.py \ + run_report.pl \ torque.setup \ torque.spec \ buildutils/config.mk \ diff --git a/src/server/Makefile.am b/src/server/Makefile.am index 5e566443cf..3bc67bfb35 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -51,5 +51,5 @@ install-exec-hook: $(DESTDIR)$(sbindir)/$(program_prefix)qserverd$(program_suffix)$(EXEEXT) uninstall-hook: - rm -f $(DESTDIR)$(PBS_ENVIRON) + rm -f $(DESTDIR)$(PBS_ENVIRON) $(DESTDIR)$(PBS_SERVER_HOME)/server_priv/nodes rm -f $(DESTDIR)$(sbindir)/$(program_prefix)qserverd$(program_suffix)$(EXEEXT) diff --git a/src/tools/xpbsmon/Makefile.am b/src/tools/xpbsmon/Makefile.am index 19e22ec8b1..356a2b222a 100644 --- a/src/tools/xpbsmon/Makefile.am +++ b/src/tools/xpbsmon/Makefile.am @@ -49,5 +49,5 @@ install-data-hook: chmod 644 tclIndex uninstall-hook: - rm -f $(DESTDIR)$(XPBS_DIR)/buildindex + rm -f $(DESTDIR)$(XPBSMON_DIR)/buildindex From f396edf312237569682ed7d19bd4945ba3c41f77 Mon Sep 17 00:00:00 2001 From: Michael Jennings Date: Mon, 17 Dec 2012 13:31:07 -0800 Subject: [PATCH 6/8] Correct fix is to rename script files in this branch. --- Makefile.am | 6 +++--- cov_file_results.pl => cov_file_results.py | 0 parse_cov_results.pl => parse_cov_results.py | 0 run_report.pl => run_report.py | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename cov_file_results.pl => cov_file_results.py (100%) rename parse_cov_results.pl => parse_cov_results.py (100%) rename run_report.pl => run_report.py (100%) diff --git a/Makefile.am b/Makefile.am index ca8fdb7f2e..028012209a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,12 +7,12 @@ EXTRA_DIST = acinclude.m4 \ autogen.sh \ CHANGELOG \ configure.ac \ - cov_file_results.pl \ + cov_file_results.py \ Doxyfile \ INSTALL \ INSTALL.GNU \ Makefile.am \ - parse_cov_results.pl \ + parse_cov_results.py \ PBS_License.txt \ README.array_changes \ README.coding_notes \ @@ -23,7 +23,7 @@ EXTRA_DIST = acinclude.m4 \ README.trqauthd \ README.building_40 \ Release_Notes \ - run_report.pl \ + run_report.py \ torque.setup \ torque.spec \ buildutils/config.mk \ diff --git a/cov_file_results.pl b/cov_file_results.py similarity index 100% rename from cov_file_results.pl rename to cov_file_results.py diff --git a/parse_cov_results.pl b/parse_cov_results.py similarity index 100% rename from parse_cov_results.pl rename to parse_cov_results.py diff --git a/run_report.pl b/run_report.py similarity index 100% rename from run_report.pl rename to run_report.py From 9dc765ba7864776ef7505e7a3f10d9e837db18f8 Mon Sep 17 00:00:00 2001 From: Daniel Hardman Date: Mon, 17 Dec 2012 15:12:32 -0700 Subject: [PATCH 7/8] complete merge request from Michael Jennings. --- run_report.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run_report.py b/run_report.py index eee2d93e1d..ea1e207053 100755 --- a/run_report.py +++ b/run_report.py @@ -18,9 +18,9 @@ def main(): print " Individual file code coverage and a Total"; print "----------------------------------------------------------------------------"; print coverage_file; - parse_res=Popen(["./parse_cov_results.pl", coverage_file]); + parse_res=Popen(["./parse_cov_results.py", coverage_file]); res=parse_res.communicate(); - file_res=Popen(["./cov_file_results.pl"]); + file_res=Popen(["./cov_file_results.py"]); res=file_res.communicate(); if __name__ == "__main__": From 8bfdb86ad9a82c0f138fe4afc9f17b4e0e508aae Mon Sep 17 00:00:00 2001 From: rockstarTS Date: Wed, 19 Dec 2012 15:46:16 -0700 Subject: [PATCH 8/8] Aligned some comments in qsub main_func --- src/cmds/qsub_functions.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmds/qsub_functions.c b/src/cmds/qsub_functions.c index 0e825a3260..491693f0ed 100644 --- a/src/cmds/qsub_functions.c +++ b/src/cmds/qsub_functions.c @@ -4055,8 +4055,8 @@ void main_func( { - int errflg; /* option error */ - char script[MAXPATHLEN + 1] = ""; /* name of script file */ + int errflg; /* option error */ + char script[MAXPATHLEN + 1] = ""; /* name of script file */ char script_tmp[MAXPATHLEN + 1] = ""; /* name of script file copy */ int script_index; char *bnp;