Commit 3695a4e0 authored by Thomas Thrainer's avatar Thomas Thrainer

Rename queryd to luxid

As queryd will, in the future, handle all LUXI request, queue jobs and
most likely perform various other tasks, it is renamed to luxid already.
This will safe some headache when upgrading Ganeti installations, as we
don't have to deal with a daemon rename.
Signed-off-by: default avatarThomas Thrainer <thomasth@google.com>
Reviewed-by: default avatarKlaus Aehlig <aehlig@google.com>
parent 238cfd3a
...@@ -124,9 +124,9 @@ ...@@ -124,9 +124,9 @@
/src/mon-collector /src/mon-collector
/src/htools /src/htools
/src/hconfd /src/hconfd
/src/hqueryd /src/hluxid
/src/ganeti-confd /src/ganeti-confd
/src/ganeti-queryd /src/ganeti-luxid
/src/ganeti-mond /src/ganeti-mond
/src/rpc-test /src/rpc-test
......
...@@ -178,7 +178,7 @@ Haskell optional features ...@@ -178,7 +178,7 @@ Haskell optional features
Optionally, more functionality can be enabled if your build machine has Optionally, more functionality can be enabled if your build machine has
a few more Haskell libraries enabled: the ``ganeti-confd`` and a few more Haskell libraries enabled: the ``ganeti-confd`` and
``ganeti-queryd`` daemon (``--enable-confd``) and the monitoring daemon ``ganeti-luxid`` daemon (``--enable-confd``) and the monitoring daemon
(``--enable-mond``). The list of extra dependencies for these is: (``--enable-mond``). The list of extra dependencies for these is:
- `hslogger <http://software.complete.org/hslogger>`_, version 1.1 and - `hslogger <http://software.complete.org/hslogger>`_, version 1.1 and
......
...@@ -201,7 +201,7 @@ CLEANFILES = \ ...@@ -201,7 +201,7 @@ CLEANFILES = \
$(HS_ALL_PROGS) $(HS_BUILT_SRCS) \ $(HS_ALL_PROGS) $(HS_BUILT_SRCS) \
$(HS_BUILT_TEST_HELPERS) \ $(HS_BUILT_TEST_HELPERS) \
src/ganeti-confd \ src/ganeti-confd \
src/ganeti-queryd \ src/ganeti-luxid \
src/ganeti-mond \ src/ganeti-mond \
.hpc/*.mix src/*.tix test/hs/*.tix \ .hpc/*.mix src/*.tix test/hs/*.tix \
doc/hs-lint.html doc/hs-lint.html
...@@ -215,7 +215,7 @@ HS_GENERATED_FILES = ...@@ -215,7 +215,7 @@ HS_GENERATED_FILES =
if WANT_HTOOLS if WANT_HTOOLS
HS_GENERATED_FILES += $(HS_PROGS) HS_GENERATED_FILES += $(HS_PROGS)
if ENABLE_CONFD if ENABLE_CONFD
HS_GENERATED_FILES += src/hconfd src/ganeti-confd src/hqueryd src/ganeti-queryd HS_GENERATED_FILES += src/hconfd src/ganeti-confd src/hluxid src/ganeti-luxid
endif endif
if ENABLE_MOND if ENABLE_MOND
...@@ -479,7 +479,7 @@ endif ...@@ -479,7 +479,7 @@ endif
HS_COMPILE_PROGS= \ HS_COMPILE_PROGS= \
src/ganeti-mond \ src/ganeti-mond \
src/hconfd \ src/hconfd \
src/hqueryd \ src/hluxid \
src/rpc-test src/rpc-test
# All Haskell non-test programs to be compiled but not automatically installed # All Haskell non-test programs to be compiled but not automatically installed
...@@ -870,11 +870,11 @@ if ENABLE_CONFD ...@@ -870,11 +870,11 @@ if ENABLE_CONFD
src/ganeti-confd: src/hconfd src/ganeti-confd: src/hconfd
cp -f $< $@ cp -f $< $@
src/ganeti-queryd: src/hqueryd src/ganeti-luxid: src/hluxid
cp -f $< $@ cp -f $< $@
nodist_sbin_SCRIPTS += src/ganeti-confd nodist_sbin_SCRIPTS += src/ganeti-confd
nodist_sbin_SCRIPTS += src/ganeti-queryd nodist_sbin_SCRIPTS += src/ganeti-luxid
endif endif
if ENABLE_MOND if ENABLE_MOND
...@@ -986,7 +986,7 @@ EXTRA_DIST = \ ...@@ -986,7 +986,7 @@ EXTRA_DIST = \
man_MANS = \ man_MANS = \
man/ganeti-cleaner.8 \ man/ganeti-cleaner.8 \
man/ganeti-confd.8 \ man/ganeti-confd.8 \
man/ganeti-queryd.8 \ man/ganeti-luxid.8 \
man/ganeti-listrunner.8 \ man/ganeti-listrunner.8 \
man/ganeti-masterd.8 \ man/ganeti-masterd.8 \
man/ganeti-mond.8 \ man/ganeti-mond.8 \
...@@ -1539,8 +1539,8 @@ lib/_autoconf.py: Makefile | stamp-directories ...@@ -1539,8 +1539,8 @@ lib/_autoconf.py: Makefile | stamp-directories
echo "RAPI_GROUP = '$(RAPI_GROUP)'"; \ echo "RAPI_GROUP = '$(RAPI_GROUP)'"; \
echo "CONFD_USER = '$(CONFD_USER)'"; \ echo "CONFD_USER = '$(CONFD_USER)'"; \
echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \ echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \
echo "QUERYD_USER = '$(QUERYD_USER)'"; \ echo "LUXID_USER = '$(LUXID_USER)'"; \
echo "QUERYD_GROUP = '$(QUERYD_GROUP)'"; \ echo "LUXID_GROUP = '$(LUXID_GROUP)'"; \
echo "NODED_USER = '$(NODED_USER)'"; \ echo "NODED_USER = '$(NODED_USER)'"; \
echo "NODED_GROUP = '$(NODED_GROUP)'"; \ echo "NODED_GROUP = '$(NODED_GROUP)'"; \
echo "MOND_USER = '$(MOND_USER)'"; \ echo "MOND_USER = '$(MOND_USER)'"; \
...@@ -1622,13 +1622,13 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories ...@@ -1622,13 +1622,13 @@ $(REPLACE_VARS_SED): $(SHELL_ENV_INIT) Makefile stamp-directories
echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \ echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \
echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \ echo 's#@''GNTRAPIUSER@#$(RAPI_USER)#g'; \
echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \ echo 's#@''GNTCONFDUSER@#$(CONFD_USER)#g'; \
echo 's#@''GNTQUERYDUSER@#$(QUERY_USER)#g'; \ echo 's#@''GNTLUXIDUSER@#$(LUXID_USER)#g'; \
echo 's#@''GNTNODEDUSER@#$(NODED_USER)#g'; \ echo 's#@''GNTNODEDUSER@#$(NODED_USER)#g'; \
echo 's#@''GNTMONDUSER@#$(MOND_USER)#g'; \ echo 's#@''GNTMONDUSER@#$(MOND_USER)#g'; \
echo 's#@''GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \ echo 's#@''GNTRAPIGROUP@#$(RAPI_GROUP)#g'; \
echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \ echo 's#@''GNTADMINGROUP@#$(ADMIN_GROUP)#g'; \
echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \ echo 's#@''GNTCONFDGROUP@#$(CONFD_GROUP)#g'; \
echo 's#@''GNTQUERYDGROUP@#$(QUERYD_GROUP)#g'; \ echo 's#@''GNTLUXIDGROUP@#$(LUXID_GROUP)#g'; \
echo 's#@''GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \ echo 's#@''GNTMASTERDGROUP@#$(MASTERD_GROUP)#g'; \
echo 's#@''GNTMONDGROUP@#$(MOND_GROUP)#g'; \ echo 's#@''GNTMONDGROUP@#$(MOND_GROUP)#g'; \
echo 's#@''GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \ echo 's#@''GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
......
...@@ -243,19 +243,19 @@ AC_ARG_WITH([user-prefix], ...@@ -243,19 +243,19 @@ AC_ARG_WITH([user-prefix],
[user_masterd="${withval}masterd"; [user_masterd="${withval}masterd";
user_rapi="${withval}rapi"; user_rapi="${withval}rapi";
user_confd="${withval}confd"; user_confd="${withval}confd";
user_queryd="${withval}queryd"; user_luxid="${withval}luxid";
user_noded="$user_default"; user_noded="$user_default";
user_mond="${withval}mond"], user_mond="${withval}mond"],
[user_masterd="$user_default"; [user_masterd="$user_default";
user_rapi="$user_default"; user_rapi="$user_default";
user_confd="$user_default"; user_confd="$user_default";
user_queryd="$user_default"; user_luxid="$user_default";
user_noded="$user_default"; user_noded="$user_default";
user_mond="$user_default"]) user_mond="$user_default"])
AC_SUBST(MASTERD_USER, $user_masterd) AC_SUBST(MASTERD_USER, $user_masterd)
AC_SUBST(RAPI_USER, $user_rapi) AC_SUBST(RAPI_USER, $user_rapi)
AC_SUBST(CONFD_USER, $user_confd) AC_SUBST(CONFD_USER, $user_confd)
AC_SUBST(QUERYD_USER, $user_queryd) AC_SUBST(LUXID_USER, $user_luxid)
AC_SUBST(NODED_USER, $user_noded) AC_SUBST(NODED_USER, $user_noded)
AC_SUBST(MOND_USER, $user_mond) AC_SUBST(MOND_USER, $user_mond)
...@@ -269,7 +269,7 @@ AC_ARG_WITH([group-prefix], ...@@ -269,7 +269,7 @@ AC_ARG_WITH([group-prefix],
[group_rapi="${withval}rapi"; [group_rapi="${withval}rapi";
group_admin="${withval}admin"; group_admin="${withval}admin";
group_confd="${withval}confd"; group_confd="${withval}confd";
group_queryd="${withval}queryd"; group_luxid="${withval}luxid";
group_masterd="${withval}masterd"; group_masterd="${withval}masterd";
group_noded="$group_default"; group_noded="$group_default";
group_daemons="${withval}daemons"; group_daemons="${withval}daemons";
...@@ -277,7 +277,7 @@ AC_ARG_WITH([group-prefix], ...@@ -277,7 +277,7 @@ AC_ARG_WITH([group-prefix],
[group_rapi="$group_default"; [group_rapi="$group_default";
group_admin="$group_default"; group_admin="$group_default";
group_confd="$group_default"; group_confd="$group_default";
group_queryd="$group_default"; group_luxid="$group_default";
group_masterd="$group_default"; group_masterd="$group_default";
group_noded="$group_default"; group_noded="$group_default";
group_daemons="$group_default"; group_daemons="$group_default";
...@@ -285,7 +285,7 @@ AC_ARG_WITH([group-prefix], ...@@ -285,7 +285,7 @@ AC_ARG_WITH([group-prefix],
AC_SUBST(RAPI_GROUP, $group_rapi) AC_SUBST(RAPI_GROUP, $group_rapi)
AC_SUBST(ADMIN_GROUP, $group_admin) AC_SUBST(ADMIN_GROUP, $group_admin)
AC_SUBST(CONFD_GROUP, $group_confd) AC_SUBST(CONFD_GROUP, $group_confd)
AC_SUBST(QUERYD_GROUP, $group_queryd) AC_SUBST(LUXID_GROUP, $group_luxid)
AC_SUBST(MASTERD_GROUP, $group_masterd) AC_SUBST(MASTERD_GROUP, $group_masterd)
AC_SUBST(NODED_GROUP, $group_noded) AC_SUBST(NODED_GROUP, $group_noded)
AC_SUBST(DAEMONS_GROUP, $group_daemons) AC_SUBST(DAEMONS_GROUP, $group_daemons)
...@@ -295,7 +295,7 @@ AC_SUBST(MOND_GROUP, $group_mond) ...@@ -295,7 +295,7 @@ AC_SUBST(MOND_GROUP, $group_mond)
AC_MSG_NOTICE([Running ganeti-masterd as $group_masterd:$group_masterd]) AC_MSG_NOTICE([Running ganeti-masterd as $group_masterd:$group_masterd])
AC_MSG_NOTICE([Running ganeti-rapi as $user_rapi:$group_rapi]) AC_MSG_NOTICE([Running ganeti-rapi as $user_rapi:$group_rapi])
AC_MSG_NOTICE([Running ganeti-confd as $user_confd:$group_confd]) AC_MSG_NOTICE([Running ganeti-confd as $user_confd:$group_confd])
AC_MSG_NOTICE([Running ganeti-queryd as $user_queryd:$group_queryd]) AC_MSG_NOTICE([Running ganeti-luxid as $user_luxid:$group_luxid])
AC_MSG_NOTICE([Group for daemons is $group_daemons]) AC_MSG_NOTICE([Group for daemons is $group_daemons])
AC_MSG_NOTICE([Group for clients is $group_admin]) AC_MSG_NOTICE([Group for clients is $group_admin])
......
...@@ -39,7 +39,7 @@ _confd_enabled() { ...@@ -39,7 +39,7 @@ _confd_enabled() {
if _confd_enabled; then if _confd_enabled; then
DAEMONS+=( ganeti-confd ) DAEMONS+=( ganeti-confd )
DAEMONS+=( ganeti-queryd ) DAEMONS+=( ganeti-luxid )
fi fi
_mond_enabled() { _mond_enabled() {
...@@ -53,7 +53,7 @@ fi ...@@ -53,7 +53,7 @@ fi
NODED_ARGS= NODED_ARGS=
MASTERD_ARGS= MASTERD_ARGS=
CONFD_ARGS= CONFD_ARGS=
QUERYD_ARGS= LUXID_ARGS=
RAPI_ARGS= RAPI_ARGS=
MOND_ARGS= MOND_ARGS=
...@@ -84,8 +84,8 @@ _daemon_usergroup() { ...@@ -84,8 +84,8 @@ _daemon_usergroup() {
confd) confd)
echo "@GNTCONFDUSER@:@GNTDAEMONSGROUP@" echo "@GNTCONFDUSER@:@GNTDAEMONSGROUP@"
;; ;;
queryd) luxid)
echo "@GNTQUERYDUSER@:@GNTQUERYDGROUP@" echo "@GNTLUXIDUSER@:@GNTLUXIDGROUP@"
;; ;;
rapi) rapi)
echo "@GNTRAPIUSER@:@GNTRAPIGROUP@" echo "@GNTRAPIUSER@:@GNTRAPIGROUP@"
...@@ -233,7 +233,7 @@ start() { ...@@ -233,7 +233,7 @@ start() {
local usergroup=$(_daemon_usergroup $plain_name) local usergroup=$(_daemon_usergroup $plain_name)
local daemonexec=$(_daemon_executable $name) local daemonexec=$(_daemon_executable $name)
if ( [[ "$name" == ganeti-confd ]] || [[ "$name" == ganeti-queryd ]] ) \ if ( [[ "$name" == ganeti-confd ]] || [[ "$name" == ganeti-luxid ]] ) \
&& ! _confd_enabled; then && ! _confd_enabled; then
echo 'ganeti-confd disabled at build time' >&2 echo 'ganeti-confd disabled at build time' >&2
return 1 return 1
......
...@@ -77,7 +77,7 @@ the instance console), to a split model: ...@@ -77,7 +77,7 @@ the instance console), to a split model:
- if just masterd is stopped, then other cluster functionality remains - if just masterd is stopped, then other cluster functionality remains
available: listing instances, connecting to the console of an available: listing instances, connecting to the console of an
instance, etc. instance, etc.
- if just "queryd" is stopped, masterd can still process jobs, and one - if just "luxid" is stopped, masterd can still process jobs, and one
can furthermore run queries from other nodes (MCs) can furthermore run queries from other nodes (MCs)
- only if both are stopped, we end up with the previous state - only if both are stopped, we end up with the previous state
...@@ -141,12 +141,12 @@ configuration queries. ...@@ -141,12 +141,12 @@ configuration queries.
The redirection of Luxi requests can be easily done based on the The redirection of Luxi requests can be easily done based on the
request type, if we have both sockets open, or if we open on demand. request type, if we have both sockets open, or if we open on demand.
We don't want the masterd to talk to the queryd itself (hidden We don't want the masterd to talk to the luxid itself (hidden
redirection), since we want to be able to run queries while masterd is redirection), since we want to be able to run queries while masterd is
down. down.
During the 2.7 release cycle, we can test all queries against both During the 2.7 release cycle, we can test all queries against both
masterd and queryd in QA, so we know we have exactly the same masterd and luxid in QA, so we know we have exactly the same
interface and it is consistent. interface and it is consistent.
.. vim: set textwidth=72 : .. vim: set textwidth=72 :
......
...@@ -104,8 +104,8 @@ RAPI_USER = _autoconf.RAPI_USER ...@@ -104,8 +104,8 @@ RAPI_USER = _autoconf.RAPI_USER
RAPI_GROUP = _autoconf.RAPI_GROUP RAPI_GROUP = _autoconf.RAPI_GROUP
CONFD_USER = _autoconf.CONFD_USER CONFD_USER = _autoconf.CONFD_USER
CONFD_GROUP = _autoconf.CONFD_GROUP CONFD_GROUP = _autoconf.CONFD_GROUP
QUERYD_USER = _autoconf.QUERYD_USER LUXID_USER = _autoconf.LUXID_USER
QUERYD_GROUP = _autoconf.QUERYD_GROUP LUXID_GROUP = _autoconf.LUXID_GROUP
NODED_USER = _autoconf.NODED_USER NODED_USER = _autoconf.NODED_USER
NODED_GROUP = _autoconf.NODED_GROUP NODED_GROUP = _autoconf.NODED_GROUP
MOND_USER = _autoconf.MOND_USER MOND_USER = _autoconf.MOND_USER
...@@ -158,7 +158,7 @@ SCP = "scp" ...@@ -158,7 +158,7 @@ SCP = "scp"
NODED = "ganeti-noded" NODED = "ganeti-noded"
CONFD = "ganeti-confd" CONFD = "ganeti-confd"
QUERYD = "ganeti-queryd" LUXID = "ganeti-luxid"
RAPI = "ganeti-rapi" RAPI = "ganeti-rapi"
MASTERD = "ganeti-masterd" MASTERD = "ganeti-masterd"
MOND = "ganeti-mond" MOND = "ganeti-mond"
...@@ -166,7 +166,7 @@ MOND = "ganeti-mond" ...@@ -166,7 +166,7 @@ MOND = "ganeti-mond"
DAEMONS = compat.UniqueFrozenset([ DAEMONS = compat.UniqueFrozenset([
NODED, NODED,
CONFD, CONFD,
QUERYD, LUXID,
RAPI, RAPI,
MASTERD, MASTERD,
MOND, MOND,
...@@ -192,7 +192,7 @@ LAST_DRBD_PORT = 14999 ...@@ -192,7 +192,7 @@ LAST_DRBD_PORT = 14999
DAEMONS_LOGBASE = { DAEMONS_LOGBASE = {
NODED: "node-daemon", NODED: "node-daemon",
CONFD: "conf-daemon", CONFD: "conf-daemon",
QUERYD: "query-daemon", LUXID: "query-daemon",
RAPI: "rapi-daemon", RAPI: "rapi-daemon",
MASTERD: "master-daemon", MASTERD: "master-daemon",
MOND: "monitoring-daemon", MOND: "monitoring-daemon",
......
...@@ -75,8 +75,8 @@ class GetentResolver: ...@@ -75,8 +75,8 @@ class GetentResolver:
@ivar masterd_gid: The resolved gid of the masterd group @ivar masterd_gid: The resolved gid of the masterd group
@ivar confd_uid: The resolved uid of the confd user @ivar confd_uid: The resolved uid of the confd user
@ivar confd_gid: The resolved gid of the confd group @ivar confd_gid: The resolved gid of the confd group
@ivar queryd_uid: The resolved uid of the queryd user @ivar luxid_uid: The resolved uid of the luxid user
@ivar queyrd_gid: The resolved gid of the queyrd group @ivar luxid_gid: The resolved gid of the luxid group
@ivar rapi_uid: The resolved uid of the rapi user @ivar rapi_uid: The resolved uid of the rapi user
@ivar rapi_gid: The resolved gid of the rapi group @ivar rapi_gid: The resolved gid of the rapi group
@ivar noded_uid: The resolved uid of the noded user @ivar noded_uid: The resolved uid of the noded user
...@@ -95,8 +95,8 @@ class GetentResolver: ...@@ -95,8 +95,8 @@ class GetentResolver:
self.confd_uid = GetUid(constants.CONFD_USER, _getpwnam) self.confd_uid = GetUid(constants.CONFD_USER, _getpwnam)
self.confd_gid = GetGid(constants.CONFD_GROUP, _getgrnam) self.confd_gid = GetGid(constants.CONFD_GROUP, _getgrnam)
self.queryd_uid = GetUid(constants.QUERYD_USER, _getpwnam) self.luxid_uid = GetUid(constants.LUXID_USER, _getpwnam)
self.queryd_gid = GetGid(constants.QUERYD_GROUP, _getgrnam) self.luxid_gid = GetGid(constants.LUXID_GROUP, _getgrnam)
self.rapi_uid = GetUid(constants.RAPI_USER, _getpwnam) self.rapi_uid = GetUid(constants.RAPI_USER, _getpwnam)
self.rapi_gid = GetGid(constants.RAPI_GROUP, _getgrnam) self.rapi_gid = GetGid(constants.RAPI_GROUP, _getgrnam)
...@@ -111,7 +111,7 @@ class GetentResolver: ...@@ -111,7 +111,7 @@ class GetentResolver:
self._uid2user = { self._uid2user = {
self.masterd_uid: constants.MASTERD_USER, self.masterd_uid: constants.MASTERD_USER,
self.confd_uid: constants.CONFD_USER, self.confd_uid: constants.CONFD_USER,
self.queryd_uid: constants.QUERYD_USER, self.luxid_uid: constants.LUXID_USER,
self.rapi_uid: constants.RAPI_USER, self.rapi_uid: constants.RAPI_USER,
self.noded_uid: constants.NODED_USER, self.noded_uid: constants.NODED_USER,
} }
...@@ -119,7 +119,7 @@ class GetentResolver: ...@@ -119,7 +119,7 @@ class GetentResolver:
self._gid2group = { self._gid2group = {
self.masterd_gid: constants.MASTERD_GROUP, self.masterd_gid: constants.MASTERD_GROUP,
self.confd_gid: constants.CONFD_GROUP, self.confd_gid: constants.CONFD_GROUP,
self.queryd_gid: constants.QUERYD_GROUP, self.luxid_gid: constants.LUXID_GROUP,
self.rapi_gid: constants.RAPI_GROUP, self.rapi_gid: constants.RAPI_GROUP,
self.noded_gid: constants.NODED_GROUP, self.noded_gid: constants.NODED_GROUP,
self.daemons_gid: constants.DAEMONS_GROUP, self.daemons_gid: constants.DAEMONS_GROUP,
......
...@@ -180,7 +180,7 @@ def GetPaths(): ...@@ -180,7 +180,7 @@ def GetPaths():
(pathutils.MASTER_SOCKET, FILE, 0660, (pathutils.MASTER_SOCKET, FILE, 0660,
getent.masterd_uid, getent.daemons_gid, False), getent.masterd_uid, getent.daemons_gid, False),
(pathutils.QUERY_SOCKET, FILE, 0660, (pathutils.QUERY_SOCKET, FILE, 0660,
getent.queryd_uid, getent.daemons_gid, False), getent.luxid_uid, getent.daemons_gid, False),
(pathutils.BDEV_CACHE_DIR, DIR, 0755, (pathutils.BDEV_CACHE_DIR, DIR, 0755,
getent.noded_uid, getent.masterd_gid), getent.noded_uid, getent.masterd_gid),
(pathutils.UIDPOOL_LOCKDIR, DIR, 0750, (pathutils.UIDPOOL_LOCKDIR, DIR, 0750,
......
ganeti-queryd(8) Ganeti | Version @GANETI_VERSION@ ganeti-luxid(8) Ganeti | Version @GANETI_VERSION@
================================================== =================================================
Name Name
---- ----
ganeti-queryd - Ganeti query daemon ganeti-luxid - Ganeti query daemon
Synopsis Synopsis
-------- --------
**ganeti-queryd** [-f] [-d] **ganeti-luxid** [-f] [-d]
DESCRIPTION DESCRIPTION
----------- -----------
**ganeti-queryd** is a daemon used to answer queries related to the **ganeti-luxid** is a daemon used to answer queries related to the
configuration and the current live state of a Ganeti cluster. configuration and the current live state of a Ganeti cluster.
For testing purposes, you can give the ``-f`` option and the For testing purposes, you can give the ``-f`` option and the
...@@ -25,7 +25,7 @@ Debug-level message can be activated by giving the ``-d`` option. ...@@ -25,7 +25,7 @@ Debug-level message can be activated by giving the ``-d`` option.
Logging to syslog, rather than its own log file, can be enabled by Logging to syslog, rather than its own log file, can be enabled by
passing in the ``--syslog`` option. passing in the ``--syslog`` option.
The **ganeti-queryd** daemon listens on a Unix socket The **ganeti-luxid** daemon listens on a Unix socket
(``@LOCALSTATEDIR@/run/ganeti/socket/ganeti-query``) on which it exports (``@LOCALSTATEDIR@/run/ganeti/socket/ganeti-query``) on which it exports
a ``Luxi`` endpoint, serving query operations only. Commands and tools a ``Luxi`` endpoint, serving query operations only. Commands and tools
use this socket if the build-time option for split queries has been use this socket if the build-time option for split queries has been
......
...@@ -54,7 +54,7 @@ def TestGanetiCommands(): ...@@ -54,7 +54,7 @@ def TestGanetiCommands():
["ganeti-rapi", "--version"], ["ganeti-rapi", "--version"],
["ganeti-watcher", "--version"], ["ganeti-watcher", "--version"],
["ganeti-confd", "--version"], ["ganeti-confd", "--version"],
["ganeti-queryd", "--version"], ["ganeti-luxid", "--version"],
) )
cmd = " && ".join([utils.ShellQuoteArgs(i) for i in cmds]) cmd = " && ".join([utils.ShellQuoteArgs(i) for i in cmds])
......
...@@ -239,11 +239,11 @@ listener creader socket = do ...@@ -239,11 +239,11 @@ listener creader socket = do
-- | Type alias for prepMain results -- | Type alias for prepMain results
type PrepResult = (FilePath, S.Socket, IORef (Result ConfigData)) type PrepResult = (FilePath, S.Socket, IORef (Result ConfigData))
-- | Check function for queryd. -- | Check function for luxid.
checkMain :: CheckFn () checkMain :: CheckFn ()
checkMain _ = return $ Right () checkMain _ = return $ Right ()
-- | Prepare function for queryd. -- | Prepare function for luxid.
prepMain :: PrepFn () PrepResult prepMain :: PrepFn () PrepResult
prepMain _ _ = do prepMain _ _ = do
socket_path <- Path.defaultQuerySocket socket_path <- Path.defaultQuerySocket
......
...@@ -57,7 +57,7 @@ data GanetiDaemon = GanetiMasterd ...@@ -57,7 +57,7 @@ data GanetiDaemon = GanetiMasterd
| GanetiNoded | GanetiNoded
| GanetiRapi | GanetiRapi
| GanetiConfd | GanetiConfd
| GanetiQueryd | GanetiLuxid
| GanetiMond | GanetiMond
deriving (Show, Enum, Bounded, Eq, Ord) deriving (Show, Enum, Bounded, Eq, Ord)
...@@ -77,7 +77,7 @@ daemonName GanetiMasterd = C.masterd ...@@ -77,7 +77,7 @@ daemonName GanetiMasterd = C.masterd
daemonName GanetiNoded = C.noded daemonName GanetiNoded = C.noded
daemonName GanetiRapi = C.rapi daemonName GanetiRapi = C.rapi
daemonName GanetiConfd = C.confd daemonName GanetiConfd = C.confd
daemonName GanetiQueryd = C.queryd daemonName GanetiLuxid = C.luxid
daemonName GanetiMond = C.mond daemonName GanetiMond = C.mond
-- | Returns whether the daemon only runs on the master node. -- | Returns whether the daemon only runs on the master node.
...@@ -86,7 +86,7 @@ daemonOnlyOnMaster GanetiMasterd = True ...@@ -86,7 +86,7 @@ daemonOnlyOnMaster GanetiMasterd = True
daemonOnlyOnMaster GanetiNoded = False daemonOnlyOnMaster GanetiNoded = False
daemonOnlyOnMaster GanetiRapi = False daemonOnlyOnMaster GanetiRapi = False
daemonOnlyOnMaster GanetiConfd = False daemonOnlyOnMaster GanetiConfd = False
daemonOnlyOnMaster GanetiQueryd = True daemonOnlyOnMaster GanetiLuxid = True
daemonOnlyOnMaster GanetiMond = False daemonOnlyOnMaster GanetiMond = False
-- | Returns the log file base for a daemon. -- | Returns the log file base for a daemon.
...@@ -95,7 +95,7 @@ daemonLogBase GanetiMasterd = C.daemonsLogbaseGanetiMasterd ...@@ -95,7 +95,7 @@ daemonLogBase GanetiMasterd = C.daemonsLogbaseGanetiMasterd
daemonLogBase GanetiNoded = C.daemonsLogbaseGanetiNoded daemonLogBase GanetiNoded = C.daemonsLogbaseGanetiNoded
daemonLogBase GanetiRapi = C.daemonsLogbaseGanetiRapi daemonLogBase GanetiRapi = C.daemonsLogbaseGanetiRapi
daemonLogBase GanetiConfd = C.daemonsLogbaseGanetiConfd daemonLogBase GanetiConfd = C.daemonsLogbaseGanetiConfd
daemonLogBase GanetiQueryd = C.daemonsLogbaseGanetiQueryd daemonLogBase GanetiLuxid = C.daemonsLogbaseGanetiLuxid
daemonLogBase GanetiMond = C.daemonsLogbaseGanetiMond daemonLogBase GanetiMond = C.daemonsLogbaseGanetiMond
-- | Returns the configured user name for a daemon. -- | Returns the configured user name for a daemon.
...@@ -104,7 +104,7 @@ daemonUser GanetiMasterd = C.masterdUser ...@@ -104,7 +104,7 @@ daemonUser GanetiMasterd = C.masterdUser
daemonUser GanetiNoded = C.nodedUser daemonUser GanetiNoded = C.nodedUser
daemonUser GanetiRapi = C.rapiUser daemonUser GanetiRapi = C.rapiUser
daemonUser GanetiConfd = C.confdUser daemonUser GanetiConfd = C.confdUser
daemonUser GanetiQueryd = C.querydUser daemonUser GanetiLuxid = C.luxidUser
daemonUser GanetiMond = C.mondUser daemonUser GanetiMond = C.mondUser
-- | Returns the configured group for a daemon. -- | Returns the configured group for a daemon.
...@@ -113,7 +113,7 @@ daemonGroup (DaemonGroup GanetiMasterd) = C.masterdGroup ...@@ -113,7 +113,7 @@ daemonGroup (DaemonGroup GanetiMasterd) = C.masterdGroup
daemonGroup (DaemonGroup GanetiNoded) = C.nodedGroup daemonGroup (DaemonGroup GanetiNoded) = C.nodedGroup
daemonGroup (DaemonGroup GanetiRapi) = C.rapiGroup daemonGroup (DaemonGroup GanetiRapi) = C.rapiGroup
daemonGroup (DaemonGroup GanetiConfd) = C.confdGroup daemonGroup (DaemonGroup GanetiConfd) = C.confdGroup
daemonGroup (DaemonGroup GanetiQueryd) = C.querydGroup daemonGroup (DaemonGroup GanetiLuxid) = C.luxidGroup
daemonGroup (DaemonGroup GanetiMond) = C.mondGroup daemonGroup (DaemonGroup GanetiMond) = C.mondGroup
daemonGroup (ExtraGroup DaemonsGroup) = C.daemonsGroup daemonGroup (ExtraGroup DaemonsGroup) = C.daemonsGroup
daemonGroup (ExtraGroup AdminGroup) = C.adminGroup daemonGroup (ExtraGroup AdminGroup) = C.adminGroup
......
...@@ -41,7 +41,7 @@ options = ...@@ -41,7 +41,7 @@ options =
-- | Main function. -- | Main function.
main :: IO () main :: IO ()
main = main =
genericMain GanetiQueryd options genericMain GanetiLuxid options
Ganeti.Query.Server.checkMain Ganeti.Query.Server.checkMain
Ganeti.Query.Server.prepMain Ganeti.Query.Server.prepMain
Ganeti.Query.Server.main Ganeti.Query.Server.main
...@@ -83,14 +83,14 @@ case_UsersGroups = do ...@@ -83,14 +83,14 @@ case_UsersGroups = do
\ constants.NODED_USER,\n\ \ constants.NODED_USER,\n\
\ constants.RAPI_USER,\n\ \ constants.RAPI_USER,\n\
\ constants.CONFD_USER,\n\ \ constants.CONFD_USER,\n\
\ constants.QUERYD_USER,\n\ \ constants.LUXID_USER,\n\
\ constants.MOND_USER,\n\ \ constants.MOND_USER,\n\
\ ]\n\ \ ]\n\
\groups = [constants.MASTERD_GROUP,\n\ \groups = [constants.MASTERD_GROUP,\n\
\ constants.NODED_GROUP,\n\ \ constants.NODED_GROUP,\n\
\ constants.RAPI_GROUP,\n\ \ constants.RAPI_GROUP,\n\
\ constants.CONFD_GROUP,\n\ \ constants.CONFD_GROUP,\n\
\ constants.QUERYD_GROUP,\n\