Skip to content

Commit 71ec552

Browse files
ernst-bablickernst-bablick
committed
BF: CS-884 There is a session 0 created although it is not required
1 parent c18a315 commit 71ec552

17 files changed

+59
-42
lines changed

‎source/common/basis_types.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,5 +220,3 @@ typedef enum {
220220
#define GRU_HARD_REQUEST_TYPE 0
221221
#define GRU_SOFT_REQUEST_TYPE 1
222222
#define GRU_RESOURCE_MAP_TYPE 2
223-
224-
#define GDI_SESSION_NONE (0LL)

‎source/daemons/qmaster/reschedule.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#include "uti/sge_time.h"
4444

4545
#include "sgeobj/ocs_DataStore.h"
46+
#include "sgeobj/ocs_Session.h"
4647
#include "sgeobj/sge_object.h"
4748
#include "sgeobj/sge_ja_task.h"
4849
#include "sgeobj/sge_report.h"
@@ -179,7 +180,7 @@ void reschedule_unknown_event(te_event_t anEvent, monitoring_t *monitor) {
179180
* unknown state and append the jobids/taskids into
180181
* a sublist of the exechost object
181182
*/
182-
reschedule_jobs(hep, 0, &answer_list, monitor, false, GDI_SESSION_NONE);
183+
reschedule_jobs(hep, 0, &answer_list, monitor, false, ocs::SessionManager::GDI_SESSION_NONE);
183184
lFreeList(&answer_list);
184185

185186
Error:

‎source/daemons/qmaster/setup_qmaster.cc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858

5959
#include "sgeobj/parse.h"
6060
#include "sgeobj/cull/sge_all_listsL.h"
61+
#include "sgeobj/ocs_Session.h"
6162
#include "sgeobj/sge_host.h"
6263
#include "sgeobj/sge_utility.h"
6364
#include "sgeobj/sge_answer.h"
@@ -899,7 +900,7 @@ setup_qmaster() {
899900
/* add an exec host "template" */
900901
sge_gdi_packet_class_t packet;
901902
sge_gdi_task_class_t task;
902-
packet.gdi_session = GDI_SESSION_NONE;
903+
packet.gdi_session = ocs::SessionManager::GDI_SESSION_NONE;
903904
if (sge_add_host_of_type(&packet, &task, SGE_TEMPLATE_NAME, SGE_EH_LIST, &monitor))
904905
ERROR(SFNMAX, MSG_CONFIG_ADDINGHOSTTEMPLATETOEXECHOSTLIST);
905906
}
@@ -909,7 +910,7 @@ setup_qmaster() {
909910
/* add an exec host "global" */
910911
sge_gdi_packet_class_t packet;
911912
sge_gdi_task_class_t task;
912-
packet.gdi_session = GDI_SESSION_NONE;
913+
packet.gdi_session = ocs::SessionManager::GDI_SESSION_NONE;
913914
if (sge_add_host_of_type(&packet, &task, SGE_GLOBAL_NAME, SGE_EH_LIST, &monitor))
914915
ERROR(SFNMAX, MSG_CONFIG_ADDINGHOSTGLOBALTOEXECHOSTLIST);
915916
}
@@ -918,7 +919,7 @@ setup_qmaster() {
918919
if (!host_list_locate(*ocs::DataStore::get_master_list(SGE_TYPE_ADMINHOST), qualified_hostname)) {
919920
sge_gdi_packet_class_t packet;
920921
sge_gdi_task_class_t task;
921-
packet.gdi_session = GDI_SESSION_NONE;
922+
packet.gdi_session = ocs::SessionManager::GDI_SESSION_NONE;
922923
if (sge_add_host_of_type(&packet, &task, qualified_hostname, SGE_AH_LIST, &monitor)) {
923924
DRETURN(-1);
924925
}
@@ -980,7 +981,7 @@ setup_qmaster() {
980981
DPRINTF("cluster_queue_list---------------------------------\n");
981982
spool_read_list(&answer_list, spooling_context, ocs::DataStore::get_master_list_rw(SGE_TYPE_CQUEUE), SGE_TYPE_CQUEUE);
982983
answer_list_output(&answer_list);
983-
cqueue_list_set_unknown_state(*(ocs::DataStore::get_master_list_rw(SGE_TYPE_CQUEUE)), nullptr, false, true, GDI_SESSION_NONE);
984+
cqueue_list_set_unknown_state(*(ocs::DataStore::get_master_list_rw(SGE_TYPE_CQUEUE)), nullptr, false, true, ocs::SessionManager::GDI_SESSION_NONE);
984985

985986
/*
986987
* Initialize cached values for each qinstance:
@@ -1044,7 +1045,7 @@ setup_qmaster() {
10441045
lListElem *qinstance;
10451046
for_each_rw(qinstance, qinstance_list) {
10461047
qinstance_set_full_name(qinstance);
1047-
sge_qmaster_qinstance_state_set_susp_on_sub(qinstance, false, GDI_SESSION_NONE);
1048+
sge_qmaster_qinstance_state_set_susp_on_sub(qinstance, false, ocs::SessionManager::GDI_SESSION_NONE);
10481049
}
10491050
}
10501051

@@ -1099,7 +1100,7 @@ setup_qmaster() {
10991100

11001101
/* array successor jobs need to have their cache rebuilt. this will
11011102
do nothing spectacular if the AD reqest list for this job is empty. */
1102-
sge_task_depend_init(jep, &answer_list, GDI_SESSION_NONE);
1103+
sge_task_depend_init(jep, &answer_list, ocs::SessionManager::GDI_SESSION_NONE);
11031104

11041105
centry_list_fill_request(job_get_hard_resource_listRW(jep),
11051106
nullptr, *ocs::DataStore::get_master_list(SGE_TYPE_CENTRY), false, true, false);
@@ -1133,7 +1134,7 @@ setup_qmaster() {
11331134
for_each_rw(tmpqep, *ocs::DataStore::get_master_list(SGE_TYPE_CQUEUE)) {
11341135
sge_gdi_packet_class_t packet;
11351136
sge_gdi_task_class_t task;
1136-
packet.gdi_session = GDI_SESSION_NONE;
1137+
packet.gdi_session = ocs::SessionManager::GDI_SESSION_NONE;
11371138
cqueue_mod_qinstances(&packet, &task, tmpqep, nullptr, tmpqep, true, false, &monitor, master_hgroup_list, master_cqueue_list);
11381139
}
11391140

@@ -1155,7 +1156,7 @@ setup_qmaster() {
11551156

11561157
DPRINTF("scheduler config -----------------------------------\n");
11571158

1158-
sge_read_sched_configuration(spooling_context, &answer_list, GDI_SESSION_NONE);
1159+
sge_read_sched_configuration(spooling_context, &answer_list, ocs::SessionManager::GDI_SESSION_NONE);
11591160
answer_list_output(&answer_list);
11601161

11611162
DPRINTF("share tree list-----------------------------------\n");

‎source/daemons/qmaster/sge_advance_reservation_qmaster.cc‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050

5151
#include "spool/sge_spooling.h"
5252

53+
#include "sgeobj/ocs_Session.h"
5354
#include "sgeobj/sge_advance_reservation.h"
5455
#include "sgeobj/sge_answer.h"
5556
#include "sgeobj/sge_conf.h"
@@ -930,10 +931,10 @@ sge_ar_event_handler(te_event_t anEvent, monitoring_t *monitor) {
930931
sge_ar_state_set_exited(ar);
931932

932933
/* remove all jobs running in this AR */
933-
sge_ar_remove_all_jobs(ar_id, 1, monitor, GDI_SESSION_NONE);
934+
sge_ar_remove_all_jobs(ar_id, 1, monitor, ocs::SessionManager::GDI_SESSION_NONE);
934935

935936
/* unblock reserved queues */
936-
ar_do_reservation(ar, false, GDI_SESSION_NONE);
937+
ar_do_reservation(ar, false, ocs::SessionManager::GDI_SESSION_NONE);
937938

938939
ocs::ReportingFileWriter::create_ar_log_records(nullptr, ar, ARL_TERMINATED,
939940
"end time of AR reached",
@@ -943,14 +944,14 @@ sge_ar_event_handler(te_event_t anEvent, monitoring_t *monitor) {
943944
sge_ar_send_mail(ar, MAIL_AT_EXIT);
944945

945946
/* remove all orphaned queue intances, which are empty. */
946-
gdil_del_all_orphaned(lGetList(ar, AR_granted_slots), nullptr, GDI_SESSION_NONE);
947+
gdil_del_all_orphaned(lGetList(ar, AR_granted_slots), nullptr, ocs::SessionManager::GDI_SESSION_NONE);
947948

948949
/* remove the AR itself */
949950
DPRINTF("AR: exited, removing AR %s\n", sge_dstring_get_string(&buffer));
950951
lRemoveElem(master_ar_list, &ar);
951952
sge_event_spool(nullptr, timestamp, sgeE_AR_DEL,
952953
ar_id, 0, sge_dstring_get_string(&buffer), nullptr, nullptr,
953-
nullptr, nullptr, nullptr, true, true, GDI_SESSION_NONE);
954+
nullptr, nullptr, nullptr, true, true, ocs::SessionManager::GDI_SESSION_NONE);
954955

955956
} else {
956957
/* AR_RUNNING */
@@ -964,7 +965,7 @@ sge_ar_event_handler(te_event_t anEvent, monitoring_t *monitor) {
964965

965966
/* this info is not spooled */
966967
sge_add_event(0, sgeE_AR_MOD, ar_id, 0,
967-
sge_dstring_get_string(&buffer), nullptr, nullptr, ar, GDI_SESSION_NONE);
968+
sge_dstring_get_string(&buffer), nullptr, nullptr, ar, ocs::SessionManager::GDI_SESSION_NONE);
968969

969970
ocs::ReportingFileWriter::create_ar_log_records(nullptr, ar, ARL_STARTTIME_REACHED,
970971
"start time of AR reached",

‎source/daemons/qmaster/sge_calendar_qmaster.cc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#include "uti/sge_rmon_macros.h"
4141
#include "uti/sge_time.h"
4242

43+
#include "sgeobj/ocs_Session.h"
4344
#include "sgeobj/sge_object.h"
4445
#include "sgeobj/sge_answer.h"
4546
#include "sgeobj/sge_cqueue.h"
@@ -50,6 +51,7 @@
5051
#include "spool/sge_spooling.h"
5152

5253
#include "evm/sge_event_master.h"
54+
5355
#include "sge_c_gdi.h"
5456
#include "sge_calendar_qmaster.h"
5557
#include "sge_qinstance_qmaster.h"
@@ -75,7 +77,7 @@ calendar_initalize_timer(monitoring_t *monitor) {
7577

7678
sge_gdi_packet_class_t packet;
7779
sge_gdi_task_class_t task;
78-
packet.gdi_session = GDI_SESSION_NONE;
80+
packet.gdi_session = ocs::SessionManager::GDI_SESSION_NONE;
7981
calendar_update_queue_states(&packet, &task, cep, nullptr, nullptr, &ppList, monitor);
8082
}
8183

@@ -250,7 +252,7 @@ void sge_calendar_event_handler(te_event_t anEvent, monitoring_t *monitor) {
250252

251253
sge_gdi_packet_class_t packet;
252254
sge_gdi_task_class_t task;
253-
packet.gdi_session = GDI_SESSION_NONE;
255+
packet.gdi_session = ocs::SessionManager::GDI_SESSION_NONE;
254256
calendar_update_queue_states(&packet, &task, cep, nullptr, nullptr, &ppList, monitor);
255257

256258
SGE_UNLOCK(LOCK_GLOBAL, LOCK_WRITE);

‎source/daemons/qmaster/sge_give_jobs.cc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
#include "uti/sge_string.h"
5454
#include "uti/sge_time.h"
5555

56+
#include "sgeobj/ocs_Session.h"
5657
#include "sgeobj/sge_ja_task.h"
5758
#include "sgeobj/sge_pe_task.h"
5859
#include "sgeobj/sge_usage.h"
@@ -736,15 +737,15 @@ sge_job_resend_event_handler(te_event_t anEvent, monitoring_t *monitor) {
736737
// delete other timers for this job/jatask
737738
te_delete_one_time_event(TYPE_JOB_RESEND_EVENT, jobid, jataskid, nullptr);
738739
// create usage
739-
sge_job_resend_event_handler_sim_job_end(jobid, jataskid, jep, jatep, monitor, now, runtime, true, GDI_SESSION_NONE);
740+
sge_job_resend_event_handler_sim_job_end(jobid, jataskid, jep, jatep, monitor, now, runtime, true, ocs::SessionManager::GDI_SESSION_NONE);
740741
} else {
741742
if (lGetUlong(jatep, JAT_status) == JTRANSFERING) {
742743
// transition transferring to running state and set a timer for job end
743-
sge_commit_job(jep, jatep, nullptr, COMMIT_ST_ARRIVED, COMMIT_DEFAULT, monitor, GDI_SESSION_NONE);
744+
sge_commit_job(jep, jatep, nullptr, COMMIT_ST_ARRIVED, COMMIT_DEFAULT, monitor, ocs::SessionManager::GDI_SESSION_NONE);
744745
trigger_job_resend(now, hep, jobid, jataskid, runtime);
745746
} else { /* must be JRUNNING */
746747
// job end, create usage
747-
sge_job_resend_event_handler_sim_job_end(jobid, jataskid, jep, jatep, monitor, now, runtime, false, GDI_SESSION_NONE);
748+
sge_job_resend_event_handler_sim_job_end(jobid, jataskid, jep, jatep, monitor, now, runtime, false, ocs::SessionManager::GDI_SESSION_NONE);
748749
}
749750
}
750751

@@ -792,7 +793,7 @@ sge_job_resend_event_handler(te_event_t anEvent, monitoring_t *monitor) {
792793
}
793794

794795
/* send job to execd */
795-
sge_give_job(jep, jatep, mqep, hep, monitor, GDI_SESSION_NONE);
796+
sge_give_job(jep, jatep, mqep, hep, monitor, ocs::SessionManager::GDI_SESSION_NONE);
796797

797798
/* reset timer */
798799
lSetUlong64(jatep, JAT_start_time, now);

‎source/daemons/qmaster/sge_host_qmaster.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
#include "uti/sge_string.h"
4646
#include "uti/sge_time.h"
4747

48+
#include "sgeobj/ocs_Session.h"
4849
#include "sgeobj/sge_conf.h"
4950
#include "sgeobj/sge_feature.h"
5051
#include "sgeobj/sge_id.h"
@@ -889,13 +890,13 @@ sge_load_value_cleanup_handler(te_event_t anEvent, monitoring_t *monitor) {
889890
host_trash_nonstatic_load_values(hep);
890891

891892
/* set all queues residing at this host in unknown state */
892-
cqueue_list_set_unknown_state(master_cqueue_list, host, true, true, GDI_SESSION_NONE);
893+
cqueue_list_set_unknown_state(master_cqueue_list, host, true, true, ocs::SessionManager::GDI_SESSION_NONE);
893894

894895
/* add a trigger to enforce limits when they are exceeded */
895896
sge_host_add_enforce_limit_trigger(host);
896897

897898
/* hedeby depends on this event */
898-
sge_add_event(0, sgeE_EXECHOST_MOD, 0, 0, host, nullptr, nullptr, hep, GDI_SESSION_NONE);
899+
sge_add_event(0, sgeE_EXECHOST_MOD, 0, 0, host, nullptr, nullptr, hep, ocs::SessionManager::GDI_SESSION_NONE);
899900

900901
/* initiate timer for this host because they turn into 'unknown' state */
901902
reschedule_unknown_trigger(hep);

‎source/daemons/qmaster/sge_job_enforce_limit.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
#include "uti/sge_string.h"
4444
#include "uti/sge_time.h"
4545

46+
#include "sgeobj/ocs_Session.h"
4647
#include "sgeobj/sge_daemonize.h"
4748
#include "sgeobj/ocs_DataStore.h"
4849
#include "sgeobj/sge_centry.h"
@@ -453,7 +454,7 @@ sge_job_enfoce_limit_handler(te_event_t event, monitoring_t *monitor) {
453454
* Assassinate the job (qdel -f)
454455
*/
455456
sge_commit_job(job, ja_task, nullptr, COMMIT_ST_FINISHED_FAILED_EE,
456-
COMMIT_DEFAULT | COMMIT_NEVER_RAN, monitor, GDI_SESSION_NONE);
457+
COMMIT_DEFAULT | COMMIT_NEVER_RAN, monitor, ocs::SessionManager::GDI_SESSION_NONE);
457458
job = nullptr;
458459
ja_task = nullptr;
459460

‎source/daemons/qmaster/sge_qmaster_process_message.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ ocs_store_packet(const struct_msg_t *message, lList *data_list, gdi_packet_reque
109109
packet->response_id = message->request_mid;
110110
packet->is_intern_request = false;
111111
packet->request_type = type;
112-
packet->gdi_session = GDI_SESSION_NONE;
112+
packet->gdi_session = ocs::SessionManager::GDI_SESSION_NONE;
113113

114114
// Append a pseudo GDI task
115115
sge_gdi_packet_append_task(packet, nullptr, 0, 0, &data_list, nullptr, nullptr, nullptr, false);

‎source/daemons/qmaster/sge_thread_listener.cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444

4545
#include "comm/cl_commlib.h"
4646

47+
#include "sgeobj/ocs_Session.h"
4748
#include "sgeobj/sge_conf.h"
4849

4950
#include "msg_qmaster.h"
@@ -90,7 +91,7 @@ sge_listener_terminate() {
9091
* 'sgeE_QMASTER_GOES_DOWN' event *before* the listener threads
9192
* are terminated.
9293
*/
93-
sge_add_event(0, sgeE_QMASTER_GOES_DOWN, 0, 0, nullptr, nullptr, nullptr, nullptr, GDI_SESSION_NONE);
94+
sge_add_event(0, sgeE_QMASTER_GOES_DOWN, 0, 0, nullptr, nullptr, nullptr, nullptr, ocs::SessionManager::GDI_SESSION_NONE);
9495
DPRINTF("triggered shutdown event for event clients to be delivered by event master module\n");
9596

9697
/*

0 commit comments

Comments
 (0)