Merge e09e775 into 333c283

doc/man1/Makefile.am

@@ -23,7 +23,8 @@ MAN1_FILES_PRIMARY = \
 	flux-proxy.1 \
 	flux-cron.1 \
 	flux-user.1 \
-	flux-event.1
+	flux-event.1 \
+	flux-hostlist.1
 
 # These files are generated as roff .so includes of a primary page.
 # A2X handles this automatically if mentioned in NAME section

doc/man1/flux-hostlist.adoc

@@ -0,0 +1,57 @@
+FLUX-HOSTLIST(1)
+================
+:doctype: manpage
+
+
+NAME
+----
+flux-hostlist - List hostnames for flux instances or jobs
+
+
+SYNOPSIS
+--------
+*flux* *hostlist* [--compressed] [JOBIDS]...
+*flux* *hostlist* [--set]
+
+
+DESCRIPTION
+-----------
+'flux hostlist' prints a list of hostnames on stdout for the current
+instance or for a set of 'JOBIDS'.
+
+Without any arguments 'flux hostlist' will attempt to read the list
+of hostnames, one per rank, from the 'resource.hosts' key in the kvs,
+and falls back to 'flux exec hostname' if the key is not found.
+
+If an optional list of 'JOBIDS' is provided as an argument to the
+command the list emitted is the union of hosts in all 'JOBIDS'.
+
+OPTIONS
+-------
+
+*-c, --compressed*::
+Output hostname list in compressed format, e.g. 'host[1-10]' instead
+of individual hostnames, one pre line.
+
+*-r, --ranks*::
+Output rank ids instead of hostnames.
+
+*--set*::
+This option is used to set the initial value for the 'resource.hosts'
+key from a file or list of hostnames on stdin. It is not meant for
+general use, but it is used by the Flux init system.
+
+
+AUTHOR
+------
+This page is maintained by the Flux community.
+
+
+RESOURCES
+---------
+Github: <http://github.com/flux-framework>
+
+
+COPYRIGHT
+---------
+include::COPYRIGHT.adoc[]

doc/test/spell.en.pws

@@ -419,3 +419,6 @@ findPrevious
 vEB
 lflux
 resizing
+HOSTLIST
+hostlist
+hostnames

etc/Makefile.am

@@ -12,7 +12,8 @@ dist_fluxrc_SCRIPTS = \
         rc3
 
 dist_fluxrc1_SCRIPTS = \
-        rc1.d/01-enclosing-instance
+        rc1.d/01-enclosing-instance \
+	rc1.d/02-hostlist
 
 flux/curve:
 	$(AM_V_GEN)$(top_builddir)/src/cmd/flux keygen --force

etc/rc1.d/02-hostlist

@@ -0,0 +1,9 @@
+# Populate resource.hosts for this instance using either R_lite
+#  from the parent instance if this is a flux job, or flux-exec hostname
+#
+if test -n "${FLUX_JOB_ID}"; then
+    FLUX_URI=$(flux getattr parent-uri) flux hostlist ${FLUX_JOB_ID} | \
+	flux hostlist --set
+else
+    flux hostlist | flux hostlist --set
+fi

src/broker/broker.c

@@ -508,14 +508,6 @@ int main (int argc, char *argv[])
      */
     unsetenv ("FLUX_URI");
 
-    /* If Flux was launched by Flux, now that PMI bootstrap is complete,
-     * unset Flux job environment variables since they don't leak into
-     * the jobs other children of this instance.
-     */
-    unsetenv ("FLUX_JOB_ID");
-    unsetenv ("FLUX_JOB_SIZE");
-    unsetenv ("FLUX_JOB_NNODES");
-
     /* If shutdown_grace was not provided on the command line,
      * make a guess.
      */
@@ -571,6 +563,14 @@ int main (int argc, char *argv[])
             log_err_exit ("runlevel_set_rc 3");
     }
 
+    /* If Flux was launched by Flux, now that PMI bootstrap and runlevel
+     * initialization is complete, unset Flux job environment variables
+     * so that they don't leak into the jobs other children of this instance.
+     */
+    unsetenv ("FLUX_JOB_ID");
+    unsetenv ("FLUX_JOB_SIZE");
+    unsetenv ("FLUX_JOB_NNODES");
+
     /* Wire up the overlay.
      */
     if (ctx.verbose)

src/cmd/Makefile.am

@@ -60,7 +60,8 @@ dist_fluxcmd_SCRIPTS = \
 	flux-exec \
 	flux-ps \
 	flux-cron \
-	flux-aggregate
+	flux-aggregate \
+	flux-hostlist
 
 fluxcmd_PROGRAMS = \
 	flux-ping \

src/cmd/flux-hostlist

@@ -0,0 +1,230 @@
+#!/usr/bin/env lua
+--[[--------------------------------------------------------------------------
+ *  Copyright (c) 2018 Lawrence Livermore National Security, LLC.  Produced at
+ *  the Lawrence Livermore National Laboratory (cf, AUTHORS, DISCLAIMER.LLNS).
+ *  LLNL-CODE-658032 All rights reserved.
+ *
+ *  This file is part of the Flux resource manager framework.
+ *  For details, see https://github.com/flux-framework.
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License as published by the Free
+ *  Software Foundation; either version 2 of the license, or (at your option)
+ *  any later version.
+ *
+ *  Flux is distributed in the hope that it will be useful, but WITHOUT
+ *  ANY WARRANTY; without even the IMPLIED WARRANTY OF MERCHANTABILITY or
+ *  FITNESS FOR A PARTICULAR PURPOSE.  See the terms and conditions of the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ *  See also:  http://www.gnu.org/licenses/
+ ---------------------------------------------------------------------------]]
+--
+-- flux-hostlist: print list of hosts in hostfile format for instance or job
+--
+--
+local getopt = require 'flux.alt_getopt'.get_opts
+local hostlist = require 'flux.hostlist'
+local wreck = require 'wreck'
+local prog = "flux-hostlist"
+local hostkey = "resource.hosts"
+
+local function printf (...)
+    io.stdout:write (string.format (...))
+end
+
+local function die (...)
+    io.stderr:write (prog..": "..string.format (...))
+    os.exit (1)
+end
+
+-- Return an array of all instance hosts by rank
+-- where hosts[rank+1] == hostname (Lua arrays are 1 origin, not 0 origin)
+local instance_hosts = {}
+local function instance_host_table (arg)
+    local f = arg.flux
+
+    if #instance_hosts > 0 then
+        return instance_hosts
+    end
+
+    if arg.ranks then
+        for i=1,f.size do
+            table.insert (instance_hosts, i-1)
+        end
+        return instance_hosts
+    end
+
+    local hosts = f:kvs_get ("resource.hosts")
+    if hosts then
+        hosts = hostlist.concat (hosts):expand ()
+        return hosts
+    end
+
+    -- O/w, try using flux-exec hostname:
+    hosts = {}
+    local r, err = io.popen ("flux exec -l hostname", "r")
+    if not r then die ("flux-exec failed: %s", err) end
+    for l in r:lines () do
+        local rank, host = l:match ("^(%d+):%s+(%S+)")
+        hosts[rank+1] = host
+    end
+
+    -- Verify that information for all ranks was returned
+    for i = 1,f.size do
+        if not hosts[i] then
+            die ("flux-exec failed to return info for rank %d!\n", i)
+        end
+    end
+    instance_hosts = hosts
+    return hosts
+end
+
+-- Get R_lite at arg.kvspath and return comma-separated list of hostnames
+local function R_lite_to_hosts (arg)
+    local f = arg.flux
+    local dir = arg.kvspath
+    local hosts = {}
+    local allhosts
+
+    local R, err = f:kvs_get (dir..".R_lite")
+    if not R then die ("Failed to get R_lite at %s: %s\n", dir, err) end
+
+    for _,entry in ipairs (R) do
+        if arg.ranks then
+            table.insert (hosts, entry.rank)
+        elseif entry.node then
+            table.insert (hosts, entry.node)
+        else
+            local allhosts = instance_host_table { flux = f }
+            table.insert (hosts, allhosts [entry.rank+1])
+        end
+    end
+    return table.concat (hosts, ",")
+end
+
+-- Return a list of hosts for jobids given in arg.args list.
+local function jobs_host_table (arg)
+    local f = arg.flux
+    local args = arg.args
+    local ranks = arg.ranks
+    local function toint (t)
+        local r = {}
+        for _,v in ipairs (t) do table.insert (r, tonumber (v)) end
+        return r
+    end
+    local function bracketify (t)
+        local r = {}
+        for _,v in ipairs (t) do table.insert (r, "["..v.."]") end
+        return r
+    end
+    local hl, err = hostlist.union (unpack (bracketify (args)))
+    if not hl then die ("hostlist.union: %s\n", err) end
+
+    local kvspaths = wreck.jobids_to_kvspath { flux = f,
+                                               jobids = toint (hl:expand())
+                                             }
+    if not kvspaths then die ("wreck.jobids_to_kvspath failed") end
+
+    local hosts = hostlist.new ()
+
+    for _,p in ipairs (kvspaths) do
+        hosts:concat (R_lite_to_hosts { flux = f, kvspath = p, ranks = ranks })
+    end
+    return hosts:expand()
+end
+
+
+local function hosts_from_stream (fp)
+    local hosts = {}
+    for line in fp:lines() do
+        for w in line:gmatch ('%S+') do table.insert (hosts, w) end
+    end
+    return hosts
+end
+
+-- Set the instance hostlist at hostkey from list of hosts on stdin
+--  or a file (arg.input).
+local function set_hostlist (arg)
+    local f = arg.flux
+    local input = arg.input
+    local fp = io.stdin
+
+    -- Open input file if not using stdin:
+    if input and not input == "-" then
+        fp, err = io.open (input, "r")
+        if not fp then die ("open: %s: %s\n", input, err) end
+    end
+
+    -- create new hostlist from lines of hosts on stream fp:
+    local hosts = hosts_from_stream (fp)
+    if #hosts == 0 then
+        die ("--set: no hosts found!")
+    end
+    fp:close()
+    local hl,err = hostlist.concat (unpack (hosts))
+    if not hl then die ("hostlist set: hostlist.concat: %s\n", err) end
+
+
+    -- Put string representation of hostlist into `hostkey`:
+    local rc, err = f:kvs_put (hostkey, tostring (hl))
+    if not rc then die ("failed to put hostlist in %s: %s\n", hostkey, err) end
+    f:kvs_commit ()
+end
+
+local function usage (code)
+    printf ("Usage: %s [OPTIONS] [JOBIDS]...\n", prog)
+    printf ("Get/set a list of hosts for the current session or job(s)\n")
+    printf ("Options:\n")
+    printf (" -h, --help       Display this message.\n")
+    printf (" -r, --ranks      Output rank ids instead of hostnames.\n")
+    printf (" -c, --compressed Output in hostlist compressed format.\n")
+    printf (" -s, --set        Initialize %s for this session\n", hostkey)
+    os.exit (code or 0)
+end
+
+-----------------------------------------------------------------------------
+--  Main program:
+-----------------------------------------------------------------------------
+--
+--
+local getopt = require 'flux.alt_getopt'.get_opts
+local opts, optind = getopt (arg, "rcsh",
+                             { compressed = "c",
+                               ranks = "r",
+                               set = "s",
+                               help = "h"
+                             })
+if opts.h then usage() end
+
+local f, err = require 'flux' .new()
+if not f then die (err) end
+
+-- If --set was used then set hostlist from stdin or arg[1]:
+if opts.s then
+    set_hostlist { flux = f, input = arg[optind] }
+    os.exit (0)
+end
+
+for i = 1,optind-1 do table.remove (arg, 1) end
+
+-- Otherwise, read either the instance hosts table or job
+--  specific hosts lists and emit one host per line to stdout:
+local hosts = {}
+if #arg == 0 then
+    hosts = instance_host_table { flux = f, ranks = opts.r }
+else
+    hosts = jobs_host_table { flux = f, ranks = opts.r, args = arg }
+end
+
+-- Print result:
+if opts.c then
+    print (hostlist.concat (unpack (hosts)))
+else
+    print (table.concat (hosts, "\n"))
+end
+
+--  vi: ts=4 sw=4 expandtab

src/cmd/flux-wreckrun

@@ -79,8 +79,9 @@ local function alloc_tasks (f, wreck, lwj)
     local counts = {}
     local total = 0
     while total < wreck.ntasks do
-        for i = 0, size-1 do
-            local n = tonumber (res[i].cores)
+        for i = 1, size do
+            local rank = i - 1
+            local n = tonumber (res[rank].cores)
             if (total + n) > wreck.ntasks then
                 n = wreck.ntasks - total
             end
@@ -89,14 +90,15 @@ local function alloc_tasks (f, wreck, lwj)
             if total == wreck.ntasks then break end
         end
     end
-    for i, ntasks in pairs (counts) do
+    for i, ntasks in ipairs (counts) do
+        local rank = i - 1
         local corelist = "0"
         if ntasks > 1 then
             corelist = corelist .. "-" .. ntasks - 1
         end
-        table.insert (Rlite, { rank = i, children = { core = corelist } })
+        table.insert (Rlite, { rank = rank, children = { core = corelist } })
         if not r[ntasks] then r[ntasks] = {} end
-        table.insert (r[ntasks], i)
+        table.insert (r[ntasks], rank)
     end
     wreck:verbose ("tasks per node: %s\n", summarize_tasks_per_node (r))
     lwj.R_lite = Rlite