Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 638 - Remove live module #1003

Merged
merged 3 commits into from Mar 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 5 additions & 6 deletions README.md
Expand Up @@ -30,12 +30,11 @@ comms modules; and _reparent_, which allows overlay networks to be
rewired on the fly.

flux-core also includes the following services implemented as
comms modules: _kvs_, a distributed key-value store; _live_,
a service that monitors overlay network health and can rewire around
failed broker instances; _modctl_, a distributed module control service;
_barrier_, a MPI-like barrier implementation; _api_, a routing service
for clients connecting to a broker instance via a UNIX domain socket;
and _wreck_ a remote execution service.
comms modules: _kvs_, a distributed key-value store; _modctl_, a
distributed module control service; _barrier_, a MPI-like barrier
implementation; _api_, a routing service for clients connecting to a
broker instance via a UNIX domain socket; and _wreck_ a remote
execution service.

A number of utilities are provided for accessing these services,
accessible via the `flux` command front-end (see below),
Expand Down
1 change: 0 additions & 1 deletion configure.ac
Expand Up @@ -273,7 +273,6 @@ AC_CONFIG_FILES( \
src/modules/content-sqlite/Makefile \
src/modules/libkz/Makefile \
src/modules/libjsc/Makefile \
src/modules/live/Makefile \
src/modules/barrier/Makefile \
src/modules/wreck/Makefile \
src/modules/resource-hwloc/Makefile \
Expand Down
12 changes: 6 additions & 6 deletions doc/man1/flux-ping.adoc
Expand Up @@ -22,12 +22,12 @@ essentially an echo of the request, with the route taken to the service
added by the service. This route is displayed in the output and can
give insight into how various addresses are routed.

'target' may be the name of a comms module service, e.g. "kvs" or "live".
flux-ping(1) will send a request to "kvs.ping" or "live.ping".
As a shorthand, 'target' can include a rank or nodeset prefix delimited by an
exclamation point. "flux ping 4!kvs" is equivalent to
"flux ping --rank 4 kvs" (see --rank option below).
Don't forget to quote the exclamation point if it is interpreted by your shell.
'target' may be the name of a comms module service, e.g. "kvs".
flux-ping(1) will send a request to "kvs.ping". As a shorthand,
'target' can include a rank or nodeset prefix delimited by an
exclamation point. "flux ping 4!kvs" is equivalent to "flux ping
--rank 4 kvs" (see --rank option below). Don't forget to quote the
exclamation point if it is interpreted by your shell.

As a shorthand, 'target' may also simply be a rank or nodeset by itself
indicating that the broker on that rank or ranks, rather than a comms
Expand Down
14 changes: 9 additions & 5 deletions doc/man1/flux-snoop.adoc
Expand Up @@ -28,20 +28,24 @@ display, is shown. For example, a "kvs.get" request and response look
like this:

--------------------------------------
>[002] |3C4ED!A76A7|
>[000] ||
>[007] kvs.get
>[028] { "conf.live.status": null }
>[028] { "key": "foo", "flags": 0 }
>[020] 8E01010FFFFFFFFF00000000FFFFFFFF00000000
--------------------------------------
<[002] |3C4ED!A76A7|
<[000] ||
<[007] kvs.get
<[080] { "conf.live.status": { "ok": "[0-7]", "fail":...
<[090] { "rootdir": { "DIRREF": "sha1-1b7ec2c61b...
<[020] 8E01020F0000216C000000010000000000000001
--------------------------------------

While a heartbeat event looks like this:

--------------------------------------
e[000] ||
e[002] hb
e[015] { "epoch": 19 }
e[013] {"epoch":437}
e[020] 8E01040F0000216C000000010000000000000000
--------------------------------------

Flux requests consist of a string message part denoting the service
Expand Down
2 changes: 1 addition & 1 deletion etc/flux-core.pc.in
Expand Up @@ -6,5 +6,5 @@ includedir=@includedir@
Name: flux-core
Description: Flux Resource Manager Framework Core
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lflux-jsc -lflux-live -lflux-kvs -lflux-barrier -lflux-core -lflux-optparse
Libs: -L${libdir} -lflux-jsc -lflux-kvs -lflux-barrier -lflux-core -lflux-optparse
Cflags: -I${includedir}
1 change: 0 additions & 1 deletion etc/rc1
Expand Up @@ -8,7 +8,6 @@ flux module load -r 0 kvs
flux module load -r all -x 0 kvs
flux module load -r all aggregator

#flux module load -r all live --barrier-count=$(flux getattr size)
flux module load -r all resource-hwloc & pids="$pids $!"
flux module load -r all job
flux module load -r 0 cron sync=hb
Expand Down
1 change: 0 additions & 1 deletion etc/rc3
Expand Up @@ -21,7 +21,6 @@ flux module remove -r 0 userdb
flux module remove -r 0 cron
flux module remove -r all job
flux module remove -r all resource-hwloc
#flux module remove -r all live

flux module remove -r all kvs
flux module remove -r all barrier
Expand Down
1 change: 0 additions & 1 deletion src/cmd/Makefile.am
Expand Up @@ -14,7 +14,6 @@ fluxcmd_ldadd = \
$(top_builddir)/src/common/libflux-core.la \
$(top_builddir)/src/common/libflux-optparse.la \
$(top_builddir)/src/modules/kvs/libflux-kvs.la \
$(top_builddir)/src/modules/live/libflux-live.la \
$(ZMQ_LIBS) $(LIBMUNGE) $(LIBPTHREAD) $(LIBDL)

LDADD = $(fluxcmd_ldadd)
Expand Down
18 changes: 0 additions & 18 deletions src/cmd/flux-comms.c
Expand Up @@ -50,9 +50,6 @@ void usage (void)
" flux-comms info\n"
" flux-comms [-r N] reparent new-uri\n"
" flux-comms [-r N] panic [msg ...]\n"
" flux-comms [-r N] failover\n"
" flux-comms [-r N] recover\n"
" flux-comms recover-all\n"
);
exit (1);
}
Expand Down Expand Up @@ -114,21 +111,6 @@ int main (int argc, char *argv[])
flux_panic (h, rank, msg);
if (msg)
free (msg);
} else if (!strcmp (cmd, "failover")) {
if (optind != argc)
usage ();
if (flux_failover (h, rank) < 0)
log_err_exit ("flux_failover");
} else if (!strcmp (cmd, "recover")) {
if (optind != argc)
usage ();
if (flux_recover (h, rank) < 0)
log_err_exit ("flux_recover");
} else if (!strcmp (cmd, "recover-all")) {
if (optind != argc)
usage ();
if (flux_recover_all (h) < 0)
log_err_exit ("flux_recover_all");
} else if (!strcmp (cmd, "info")) {
int arity;
uint32_t rank, size;
Expand Down
1 change: 0 additions & 1 deletion src/common/core.h
Expand Up @@ -32,7 +32,6 @@
#include "core/flux.h"

#include "core/kvs.h"
#include "core/live.h"
#include "core/barrier.h"
#include "core/jstatctl.h"

Expand Down
1 change: 0 additions & 1 deletion src/include/flux/core.h
Expand Up @@ -7,7 +7,6 @@
#include "src/common/libflux/flux.h"

#include "src/modules/kvs/kvs.h"
#include "src/modules/live/live.h"
#include "src/modules/barrier/barrier.h"
#include "src/modules/libjsc/jstatctl.h"

Expand Down
1 change: 0 additions & 1 deletion src/modules/Makefile.am
Expand Up @@ -5,7 +5,6 @@ SUBDIRS = \
kvs \
content-sqlite \
libkz \
live \
wreck \
libjsc \
resource-hwloc \
Expand Down
40 changes: 0 additions & 40 deletions src/modules/live/Makefile.am

This file was deleted.

79 changes: 0 additions & 79 deletions src/modules/live/liblive.c

This file was deleted.