Revision 61631293
b/Makefile.am | ||
---|---|---|
477 | 477 |
$(PYTHON_BOOTSTRAP_SBIN) \ |
478 | 478 |
daemons/ganeti-cleaner |
479 | 479 |
|
480 |
dist_tools_SCRIPTS = \
|
|
480 |
dist_tools_PYTHON = \
|
|
481 | 481 |
tools/burnin \ |
482 | 482 |
tools/cfgshell \ |
483 | 483 |
tools/cfgupgrade \ |
... | ... | |
488 | 488 |
tools/setup-ssh \ |
489 | 489 |
tools/sanitize-config |
490 | 490 |
|
491 |
dist_tools_SCRIPTS = \ |
|
492 |
$(dist_tools_PYTHON) \ |
|
493 |
tools/xm-console-wrapper |
|
494 |
|
|
491 | 495 |
pkglib_python_scripts = \ |
492 | 496 |
daemons/import-export \ |
493 | 497 |
tools/check-cert-expired |
... | ... | |
684 | 688 |
|
685 | 689 |
all_python_code = \ |
686 | 690 |
$(dist_sbin_SCRIPTS) \ |
687 |
$(dist_tools_SCRIPTS) \
|
|
691 |
$(dist_tools_PYTHON) \
|
|
688 | 692 |
$(pkglib_python_scripts) \ |
689 | 693 |
$(nodist_pkglib_python_scripts) \ |
690 | 694 |
$(python_tests) \ |
... | ... | |
721 | 725 |
ganeti \ |
722 | 726 |
ganeti/http/server.py \ |
723 | 727 |
$(dist_sbin_SCRIPTS) \ |
724 |
$(dist_tools_SCRIPTS) \
|
|
728 |
$(dist_tools_PYTHON) \
|
|
725 | 729 |
$(pkglib_python_scripts) \ |
726 | 730 |
$(BUILD_BASH_COMPLETION) \ |
727 | 731 |
$(DOCPP) \ |
b/lib/constants.py | ||
---|---|---|
144 | 144 |
DAEMON_UTIL = _autoconf.PKGLIBDIR + "/daemon-util" |
145 | 145 |
SETUP_SSH = _autoconf.TOOLSDIR + "/setup-ssh" |
146 | 146 |
KVM_IFUP = _autoconf.PKGLIBDIR + "/kvm-ifup" |
147 |
XM_CONSOLE_WRAPPER = _autoconf.PKGLIBDIR + "/tools/xm-console-wrapper" |
|
147 | 148 |
ETC_HOSTS = "/etc/hosts" |
148 | 149 |
DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR |
149 | 150 |
DEFAULT_SHARED_FILE_STORAGE_DIR = _autoconf.SHARED_FILE_STORAGE_DIR |
b/lib/hypervisor/hv_xen.py | ||
---|---|---|
307 | 307 |
kind=constants.CONS_SSH, |
308 | 308 |
host=instance.primary_node, |
309 | 309 |
user=constants.GANETI_RUNAS, |
310 |
command=["xm", "console", instance.name]) |
|
310 |
command=[constants.XM_CONSOLE_WRAPPER, |
|
311 |
instance.name]) |
|
311 | 312 |
|
312 | 313 |
def Verify(self): |
313 | 314 |
"""Verify the hypervisor. |
b/tools/xm-console-wrapper | ||
---|---|---|
1 |
#!/bin/bash |
|
2 |
|
|
3 |
# Copyright (C) 2011 Google Inc. |
|
4 |
# |
|
5 |
# This program is free software; you can redistribute it and/or modify |
|
6 |
# it under the terms of the GNU General Public License as published by |
|
7 |
# the Free Software Foundation; either version 2 of the License, or |
|
8 |
# (at your option) any later version. |
|
9 |
# |
|
10 |
# This program is distributed in the hope that it will be useful, but |
|
11 |
# WITHOUT ANY WARRANTY; without even the implied warranty of |
|
12 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
13 |
# General Public License for more details. |
|
14 |
# |
|
15 |
# You should have received a copy of the GNU General Public License |
|
16 |
# along with this program; if not, write to the Free Software |
|
17 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA |
|
18 |
# 02110-1301, USA. |
|
19 |
|
|
20 |
INSTANCE="$1" |
|
21 |
|
|
22 |
unpause() { |
|
23 |
ispaused=$(xm list -l "$INSTANCE" 2>/dev/null | |
|
24 |
sed -n 's/^[[:blank:]]*(state ..\(.\)...)/\1/p') |
|
25 |
[[ "$ispaused" == "p" ]] || return |
|
26 |
# As there is no way to be sure when xm console has actually connected to the |
|
27 |
# instance, sleep for a few seconds before unpausing the instance. This is a |
|
28 |
# tradeoff between missing some console output if the node is overloaded and |
|
29 |
# making the user wait everytime when the node isn't so busy. |
|
30 |
sleep 3 |
|
31 |
# Send \r\n after notice as terminal is in raw mode |
|
32 |
printf "Instance $INSTANCE is paused, unpausing\r\n" |
|
33 |
xm unpause "$INSTANCE" |
|
34 |
} |
|
35 |
|
|
36 |
unpause & |
|
37 |
exec xm console "$INSTANCE" |
Also available in: Unified diff