Ticket #524: 175

File 175, 8.7 KB (added by dlove, 10 years ago)
Line 
1? source/2497.diff
2? source/2505MT.diff
3? source/aimk.private
4? source/DARWIN_X86
5? source/SOLARISAMD64
6? source/SOLARIS64
7? source/SOLARIS
8? source/DARWIN_PPC
9? source/LINUXAMD64_24
10? source/IRIX65
11? source/ULINUX86_24
12? source/LINUXIA64_24
13? source/LINUX86_24
14? source/3rdparty/fnmatch/fnmatch_dependencies
15? source/3rdparty/qmake/IRIX65/make
16? source/3rdparty/qmake/LINUXAMD64_24/make
17? source/3rdparty/qmake/SOLARIS64/make
18? source/3rdparty/qmake/SOLARISAMD64/make
19? source/3rdparty/qmon/SOLARIS64
20? source/3rdparty/qmon/SOLARISAMD64
21? source/3rdparty/qmon/LINUXAMD64_24
22? source/3rdparty/qmon/IRIX65
23? source/3rdparty/qtcsh/IRIX65/sh.err.h
24? source/3rdparty/qtcsh/IRIX65/ed.defns.h
25? source/3rdparty/qtcsh/IRIX65/tc.const.h
26? source/3rdparty/qtcsh/IRIX65/gethost
27? source/3rdparty/qtcsh/IRIX65/tc.defs.c
28? source/3rdparty/qtcsh/IRIX65/tcsh
29? source/3rdparty/qtcsh/LINUXAMD64_24/sh.err.h
30? source/3rdparty/qtcsh/LINUXAMD64_24/ed.defns.h
31? source/3rdparty/qtcsh/LINUXAMD64_24/tc.const.h
32? source/3rdparty/qtcsh/LINUXAMD64_24/gethost
33? source/3rdparty/qtcsh/LINUXAMD64_24/tc.defs.c
34? source/3rdparty/qtcsh/LINUXAMD64_24/tcsh
35? source/3rdparty/qtcsh/SOLARIS64/sh.err.h
36? source/3rdparty/qtcsh/SOLARIS64/ed.defns.h
37? source/3rdparty/qtcsh/SOLARIS64/tc.const.h
38? source/3rdparty/qtcsh/SOLARIS64/gethost
39? source/3rdparty/qtcsh/SOLARIS64/tc.defs.c
40? source/3rdparty/qtcsh/SOLARIS64/tcsh
41? source/3rdparty/qtcsh/SOLARISAMD64/sh.err.h
42? source/3rdparty/qtcsh/SOLARISAMD64/tc.const.h
43? source/3rdparty/qtcsh/SOLARISAMD64/ed.defns.h
44? source/3rdparty/qtcsh/SOLARISAMD64/tc.defs.c
45? source/3rdparty/qtcsh/SOLARISAMD64/gethost
46? source/3rdparty/qtcsh/SOLARISAMD64/tcsh
47? source/3rdparty/remote/SOLARISAMD64
48? source/3rdparty/remote/LINUXAMD64_24
49? source/3rdparty/remote/IRIX65
50? source/3rdparty/remote/SOLARIS64/rsh
51? source/3rdparty/remote/SOLARIS64/rshd
52? source/3rdparty/remote/SOLARIS64/rlogin
53? source/3rdparty/sge_depend/DARWIN_X86
54? source/3rdparty/sge_depend/SOLARISAMD64
55? source/3rdparty/sge_depend/LINUXAMD64_24
56? source/3rdparty/sge_depend/SOLARIS64
57? source/3rdparty/strptime/strptime_dependencies
58? source/clients/common/common_dependencies
59? source/clients/qacct/qacct_dependencies
60? source/clients/qalter/qalter_dependencies
61? source/clients/qconf/qconf_dependencies
62? source/clients/qdel/qdel_dependencies
63? source/clients/qevent/qevent_dependencies
64? source/clients/qhost/qhost_dependencies
65? source/clients/qmod/qmod_dependencies
66? source/clients/qmon/qmon_dependencies
67? source/clients/qquota/qquota_dependencies
68? source/clients/qrdel/qrdel_dependencies
69? source/clients/qrsh/qrsh_dependencies
70? source/clients/qrstat/qrstat_dependencies
71? source/clients/qrsub/qrsub_dependencies
72? source/clients/qsh/qsh_dependencies
73? source/clients/qstat/qstat_dependencies
74? source/clients/qsub/qsub_dependencies
75? source/common/common_dependencies
76? source/daemons/common/common_dependencies
77? source/daemons/execd/execd_dependencies
78? source/daemons/qmaster/qmaster_dependencies
79? source/daemons/shadowd/shadowd_dependencies
80? source/daemons/shepherd/shepherd_dependencies
81? source/dist/qmon/Qmon
82? source/libs/comm/commlib_dependencies
83? source/libs/comm/examples/commexamples_dependencies
84? source/libs/comm/lists/commlistslib_dependencies
85? source/libs/cull/cull_dependencies
86? source/libs/evc/evc_dependencies
87? source/libs/evm/evm_dependencies
88? source/libs/gdi/gdi_dependencies
89? source/libs/japi/japi_dependencies
90? source/libs/jgdi/examples/src/com/sun/grid/jgdi/examples/QueueInstanceSummaryExample.jav
91? source/libs/jgdi/examples/src/com/sun/grid/jgdi/examples/jmxeventmonitor/ErrorDialog.jav
92? source/libs/jgdi/src/com/sun/grid/jgdi/configuration/reflect/AbstractClassDescriptor.jav
93? source/libs/lck/lck_dependencies
94? source/libs/mir/mir_dependencies
95? source/libs/rmon/rmon_dependencies
96? source/libs/sched/sched_dependencies
97? source/libs/sched/.sge_select_queue.c.swp
98? source/libs/sgeobj/sgeobj_dependencies
99? source/libs/spool/spool_dependencies
100? source/libs/spool/berkeleydb/spoolb_dependencies
101? source/libs/spool/classic/spoolc_old_dependencies
102? source/libs/spool/dynamic/spoold_dependencies
103? source/libs/spool/flatfile/spoolc_dependencies
104? source/libs/spool/loader/spoolloader_dependencies
105? source/libs/spool/postgres/spoolp_dependencies
106? source/libs/uti/uti_dependencies
107? source/libs/uti/libcore.c
108? source/security/coshepherd/coshepherd_dependencies
109? source/security/gss/gss_dependencies
110? source/security/krb/krb_dependencies
111? source/utilbin/utilbin_dependencies
112Index: source/libs/sched/sge_select_queue.c
113===================================================================
114RCS file: /cvs/gridengine/source/libs/sched/sge_select_queue.c,v
115retrieving revision 1.206
116diff -r1.206 sge_select_queue.c
1171520a1521
118>    bool could_be_master = false;
1191586,1601d1586
120<     * is queue contained in hard queue list ?
121<     */
122<    if (hard_queue_list) {
123<       if (qref_list_cq_rejected(hard_queue_list, lGetString(queue, QU_qname),
124<                      lGetHost(queue, QU_qhostname), hgrp_list)) {
125<          DPRINTF(("Queue \"%s\" is not contained in the hard "
126<                   "queue list (-q) that was requested by job %d\n",
127<                   qinstance_name, (int) job_id));
128<          schedd_mes_add(job_id, SCHEDD_INFO_NOTINHARDQUEUELST_S,
129<                         qinstance_name);
130<          DRETURN(DISPATCH_NEVER_CAT);
131<       }
132<    }
133<
134<
135<    /*
1361618a1604,1620
137>    } else
138>       lSetUlong(queue, QU_tagged4schedule, 0);
139>       
140>
141>    /*
142>     * is queue contained in hard queue list ?
143>     */
144>    if (hard_queue_list) {
145>       if (could_be_master = false && qref_list_cq_rejected(hard_queue_list, lGetString(queue, QU_qname),
146>                      lGetHost(queue, QU_qhostname), hgrp_list)) {
147>          DPRINTF(("Queue \"%s\" is not contained in the hard "
148>                   "queue list (-q) that was requested by job %d\n",
149>                   qinstance_name, (int) job_id));
150>          schedd_mes_add(job_id, SCHEDD_INFO_NOTINHARDQUEUELST_S,
151>                         qinstance_name);
152>          DRETURN(DISPATCH_NEVER_CAT);
153>       }
1543021c3023,3024
155<    if (qref_list_cq_rejected(lGetList(a->job, JB_hard_queue_list), cqname, NULL, NULL)) {
156---
157>    if (qref_list_cq_rejected(lGetList(a->job, JB_hard_queue_list), cqname, NULL, NULL) &&
158>        (!a->pe_name || qref_list_cq_rejected(lGetList(a->job, JB_master_hard_queue_list), cqname, NULL, NULL))) {
1593831c3834,3835
160<                      DPRINTF(("SLOT HARVESTING: %s soft violations %d\n", lGetString(qep, QU_full_name), lGetUlong(qep, QU_soft_violation)));
161---
162>                      DPRINTF(("SLOT HARVESTING: %s soft violations: %d master: %d\n",
163>                            lGetString(qep, QU_full_name), lGetUlong(qep, QU_soft_violation), lGetUlong(qep, QU_tagged4schedule)));
1643835,3837c3839,3849
165<                      if (need_master_host && !have_master_host && !got_master_queue && lGetUlong(qep, QU_tagged4schedule)==0) {
166<                         if (accu_host_slots + rqs_hslots + slots == a->slots)
167<                            slots--;
168---
169>
170>                      if (need_master_host) {
171>                         if (!have_master_host && !got_master_queue && lGetUlong(qep, QU_tagged4schedule)==0
172>                              && accu_host_slots + rqs_hslots + slots == a->slots)
173>                               slots--;
174>                         if (lGetUlong(qep, QU_tagged4schedule)==1) {
175>                            if (!have_master_host && !got_master_queue)
176>                               slots = MIN(slots, 1);
177>                            else
178>                               slots = 0;
179>                         }
1803838a3851
181>
1823929,3930c3942,3945
183<                      if (need_master_host && !have_master_host_qend && !got_master_queue && lGetUlong(qep, QU_tagged4schedule)==0) {
184<                         if (accu_host_slots_qend + rqs_hslots + slots_qend == a->slots)
185---
186>
187>                      if (need_master_host) {
188>                         if (!have_master_host_qend && !got_master_queue && lGetUlong(qep, QU_tagged4schedule)==0
189>                             && accu_host_slots_qend + rqs_hslots + slots_qend == a->slots)
1903931a3947,3952
191>                         if (need_master_host && lGetUlong(qep, QU_tagged4schedule)==1) {
192>                            if (!have_master_host_qend && !got_master_queue)
193>                               slots_qend = MIN(slots_qend, 1);
194>                            else
195>                               slots_qend = 0;
196>                         }
1974104c4125,4126
198<    if (!qref_list_eh_rejected(lGetList(a->job, JB_hard_queue_list), eh_name, a->hgrp_list) &&
199---
200>    if (!(qref_list_eh_rejected(lGetList(a->job, JB_hard_queue_list), eh_name, a->hgrp_list) &&
201>         qref_list_eh_rejected(lGetList(a->job, JB_master_hard_queue_list), eh_name, a->hgrp_list)) &&