View | Details | Raw Unified | Return to ticket 12943
Collapse All | Expand All

(-)a/job_submit.lua (-2 / +4 lines)
Lines 5-11 if dir ~= nil then Link Here
5
end
5
end
6
require "osc_common"
6
require "osc_common"
7
-- This file is auto-generated by Puppet
7
-- This file is auto-generated by Puppet
8
require "job_submit_data"
8
-- require "job_submit_data"
9
require "job_submit_lib"
9
require "job_submit_lib"
10
10
11
-- 363GB as MB
11
-- 363GB as MB
Lines 190-195 function slurm_job_submit(job_desc, part_list, submit_uid) Link Here
190
    slurm.log_user("WARNING: Job script lacks first line beginning with #! shell. Injecting '#!%s' as first line of job script.", shebang_injected)
190
    slurm.log_user("WARNING: Job script lacks first line beginning with #! shell. Injecting '#!%s' as first line of job script.", shebang_injected)
191
    slurm.log_info("action=inject_shebang msg=\"Adding bash shebang to first line of script\" shell=%s user=%s", shebang_injected, username)
191
    slurm.log_info("action=inject_shebang msg=\"Adding bash shebang to first line of script\" shell=%s user=%s", shebang_injected, username)
192
  end
192
  end
193
--[[
193
  -- Assign condo partition(s)
194
  -- Assign condo partition(s)
194
  condo_partition = assign_condo(job_desc, username)
195
  condo_partition = assign_condo(job_desc, username)
195
  if condo_partition ~= nil then
196
  if condo_partition ~= nil then
Lines 218-223 function slurm_job_submit(job_desc, part_list, submit_uid) Link Here
218
      slurm.log_info("action=backfill-bypass reqpart=%s time_limit=%d user=%s", reqpart, time_limit, username)
219
      slurm.log_info("action=backfill-bypass reqpart=%s time_limit=%d user=%s", reqpart, time_limit, username)
219
    end
220
    end
220
  end
221
  end
222
--]]
221
  -- Set whole node where needed
223
  -- Set whole node where needed
222
  shared = set_whole_node(job_desc)
224
  shared = set_whole_node(job_desc)
223
  slurm.log_info("slurm_job_submit: action=set_whole_node shared=%s user=%s", tostring(shared), username)
225
  slurm.log_info("slurm_job_submit: action=set_whole_node shared=%s user=%s", tostring(shared), username)
Lines 228-234 function slurm_job_submit(job_desc, part_list, submit_uid) Link Here
228
  -- Set some environment variables
230
  -- Set some environment variables
229
  set_environments(job_desc, username)
231
  set_environments(job_desc, username)
230
  -- Assign GRES for filesystem
232
  -- Assign GRES for filesystem
231
  --filesystem_gres(job_desc, username)
233
  filesystem_gres(job_desc, username)
232
  -- Assign default GRES subtype
234
  -- Assign default GRES subtype
233
  if job_desc.gres ~= nil then
235
  if job_desc.gres ~= nil then
234
    new_gres = gres_defaults(job_desc.gres)
236
    new_gres = gres_defaults(job_desc.gres)
(-)a/job_submit_lib.lua (-2 / +2 lines)
Lines 221-228 function assign_condo(job_desc, username) Link Here
221
    return nil
221
    return nil
222
  end
222
  end
223
  account = string.upper(account)
223
  account = string.upper(account)
224
  part = account_condo_partition_map[account]
224
  -- part = account_condo_partition_map[account]
225
  optional_part = account_condo_optional_partition_map[account] or ""
225
  -- optional_part = account_condo_optional_partition_map[account] or ""
226
  if part == nil then
226
  if part == nil then
227
    slurm.log_debug("action=assign_condo level=debug msg=\"Skipping, no condo partition found\" account=%s", tostring(account))
227
    slurm.log_debug("action=assign_condo level=debug msg=\"Skipping, no condo partition found\" account=%s", tostring(account))
228
    return nil
228
    return nil

Return to ticket 12943