Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
slapos.toolbox
Commits
d2312c15
Commit
d2312c15
authored
Aug 13, 2012
by
Antoine Catton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add shellinabox process management.
parent
560f5b94
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
148 additions
and
29 deletions
+148
-29
slapos/container/__init__.py
slapos/container/__init__.py
+28
-2
slapos/container/process.py
slapos/container/process.py
+120
-27
No files found.
slapos/container/__init__.py
View file @
d2312c15
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
import
ConfigParser
import
ConfigParser
import
argparse
import
argparse
import
gdbm
import
sys
import
sys
import
os
import
os
...
@@ -13,13 +14,33 @@ def main():
...
@@ -13,13 +14,33 @@ def main():
parser
=
argparse
.
ArgumentParser
(
description
=
"Slapcontainer binary"
)
parser
=
argparse
.
ArgumentParser
(
description
=
"Slapcontainer binary"
)
parser
.
add_argument
(
'configuration_file'
,
type
=
str
,
parser
.
add_argument
(
'configuration_file'
,
type
=
str
,
help
=
"SlapOS configuration file."
)
help
=
"SlapOS configuration file."
)
parser
.
add_argument
(
'database'
,
type
=
str
,
help
=
'slapcontainer database'
)
log_lvls
=
[
lvl
for
lvl
in
logging
.
_levelNames
.
keys
()
log_lvls
=
[
lvl
for
lvl
in
logging
.
_levelNames
.
keys
()
if
isinstance
(
lvl
,
basestring
)]
if
isinstance
(
lvl
,
basestring
)]
parser
.
add_argument
(
'--log'
,
nargs
=
1
,
default
=
[
'INFO'
],
parser
.
add_argument
(
'--log'
,
nargs
=
1
,
default
=
[
'INFO'
],
choices
=
log_lvls
,
choices
=
log_lvls
,
metavar
=
'lvl'
)
metavar
=
'lvl'
,
help
=
'Log level'
)
parser
.
add_argument
(
'--pid'
,
nargs
=
1
,
help
=
'pid file path'
)
args
=
parser
.
parse_args
()
args
=
parser
.
parse_args
()
if
args
.
pid
is
not
None
:
pid_filename
=
args
.
pid
[
0
]
if
os
.
path
.
exists
(
pid_filename
):
print
>>
sys
.
stderr
,
"Already running"
return
127
with
open
(
pid_filename
,
'w'
)
as
pid_file
:
pid_file
.
write
(
str
(
os
.
getpid
()))
try
:
run
(
args
)
finally
:
os
.
remove
(
pid_filename
)
else
:
run
(
args
)
def
run
(
args
):
slapos_conf
=
ConfigParser
.
ConfigParser
()
slapos_conf
=
ConfigParser
.
ConfigParser
()
slapos_conf
.
read
(
args
.
configuration_file
)
slapos_conf
.
read
(
args
.
configuration_file
)
...
@@ -36,4 +57,9 @@ def main():
...
@@ -36,4 +57,9 @@ def main():
logging
.
basicConfig
(
level
=
logging
.
getLevelName
(
args
.
log
[
0
]))
logging
.
basicConfig
(
level
=
logging
.
getLevelName
(
args
.
log
[
0
]))
process
.
main
(
sr_directory
,
partition_list
)
database
=
gdbm
.
open
(
args
.
database
,
'c'
,
0600
)
try
:
process
.
main
(
sr_directory
,
partition_list
,
database
)
finally
:
database
.
sync
()
database
.
close
()
slapos/container/process.py
View file @
d2312c15
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
import
os
import
os
import
subprocess
import
subprocess
import
logging
import
logging
import
signal
class
SlapContainerError
(
Exception
):
class
SlapContainerError
(
Exception
):
"""This exception is thrown, if there is
"""This exception is thrown, if there is
...
@@ -11,11 +12,14 @@ class SlapContainerError(Exception):
...
@@ -11,11 +12,14 @@ class SlapContainerError(Exception):
def
main
(
sr_directory
,
partition_list
):
def
main
(
sr_directory
,
partition_list
,
database
):
logger
=
logging
.
getLogger
(
'process'
)
logger
=
logging
.
getLogger
(
'process'
)
to_start
=
set
()
######################
# Process partitions #
######################
start_requested
=
set
()
logger
.
debug
(
'Processing partitions...'
)
logger
.
debug
(
'Processing partitions...'
)
for
partition_path
in
partition_list
:
for
partition_path
in
partition_list
:
partition_logger
=
logger
.
getChild
(
partition_logger
=
logger
.
getChild
(
...
@@ -37,17 +41,25 @@ def main(sr_directory, partition_list):
...
@@ -37,17 +41,25 @@ def main(sr_directory, partition_list):
with
open
(
lxc_conf_path
,
'r'
)
as
lxc_conf_file
:
with
open
(
lxc_conf_path
,
'r'
)
as
lxc_conf_file
:
requested_status
=
lxc_conf_file
.
readline
().
strip
(
'
\
n
\
r
\
t
#'
)
requested_status
=
lxc_conf_file
.
readline
().
strip
(
'
\
n
\
r
\
t
#'
)
if
requested_status
==
'started'
:
if
requested_status
==
'started'
:
start_requested
.
add
(
name
)
current_status
=
status
(
sr_directory
,
partition_path
,
name
)
process_partition
(
requested_status
=
requested_status
,
to_start
.
add
(
name
)
sr_directory
=
sr_directory
,
partition_path
=
partition_path
,
name
=
name
,
database
=
database
,
logger
=
partition_logger
,
lxc_conf_filename
=
lxc_conf_path
)
if
requested_status
!=
current_status
:
if
start_requested
:
start
(
sr_directory
,
partition_path
,
name
,
lxc_conf_path
)
logger
.
debug
(
'Container which start was requested : %s.'
,
', '
.
join
(
start_requested
))
logger
.
debug
(
'Container to start %s.'
,
', '
.
join
(
to_start
))
####################################
# Stop unwanted running containers #
####################################
try
:
try
:
active_containers
=
set
(
call
(
active_containers
=
set
(
call
(
[
os
.
path
.
join
(
sr_directory
,
'parts/lxc/bin/lxc-ls'
),
[
os
.
path
.
join
(
sr_directory
,
'parts/lxc/bin/lxc-ls'
),
...
@@ -57,9 +69,12 @@ def main(sr_directory, partition_list):
...
@@ -57,9 +69,12 @@ def main(sr_directory, partition_list):
except
SlapContainerError
:
except
SlapContainerError
:
active_containers
=
set
()
active_containers
=
set
()
to_stop
=
active_containers
-
to_start
### Stop containers
to_stop
=
active_containers
-
start_requested
if
to_stop
:
if
to_stop
:
logger
.
debug
(
'Stopping containers %s.'
,
', '
.
join
(
to_stop
))
logger
.
debug
(
'Stopping containers %s.'
,
', '
.
join
(
to_stop
))
else
:
logger
.
debug
(
'No extra containers to stop.'
)
for
container
in
to_stop
:
for
container
in
to_stop
:
try
:
try
:
...
@@ -72,26 +87,91 @@ def main(sr_directory, partition_list):
...
@@ -72,26 +87,91 @@ def main(sr_directory, partition_list):
except
SlapContainerError
:
except
SlapContainerError
:
logger
.
fatal
(
'Impossible to stop %s.'
,
container
)
logger
.
fatal
(
'Impossible to stop %s.'
,
container
)
### Stop shellinaboxes
active_shellinabox
=
set
(
database
.
keys
())
to_stop
=
active_shellinabox
-
start_requested
if
to_stop
:
logger
.
debug
(
'Stopping shellinaboxes %s.'
,
', '
.
join
(
to_stop
))
else
:
logger
.
debug
(
'No extra shellinabox to stop.'
)
for
shellinabox
in
to_stop
:
pid
=
int
(
database
[
shellinabox
])
try
:
os
.
kill
(
pid
,
signal
.
SIGTERM
)
except
OSError
:
# Shellinabox's already stopped
del
database
[
shellinabox
]
else
:
# Stopping shellinabox
if
not
is_pid_running
(
pid
):
del
database
[
shellinabox
]
def
start
(
sr_directory
,
partition_path
,
name
,
lxc_conf_path
):
lxc_start
=
os
.
path
.
join
(
sr_directory
,
'parts/lxc/bin/lxc-start'
)
call
([
lxc_start
,
'-f'
,
lxc_conf_path
,
'-n'
,
name
,
'-d'
])
def
status
(
sr_directory
,
partition_path
,
name
):
logger
=
logging
.
getLogger
(
'status'
)
def
process_partition
(
requested_status
,
logger
.
debug
(
'Check status of %s'
,
name
)
sr_directory
,
partition_path
,
name
,
database
,
logger
,
lxc_conf_filename
):
if
requested_status
==
'started'
:
##############################
# Stateless container launch #
##############################
logger
.
debug
(
'Check status.'
)
lxc_info
=
call
([
os
.
path
.
join
(
sr_directory
,
'parts/lxc/bin/lxc-info'
),
lxc_info
=
call
([
os
.
path
.
join
(
sr_directory
,
'parts/lxc/bin/lxc-info'
),
'-n'
,
name
])
'-n'
,
name
])
### Check if container is launched
if
'RUNNING'
in
lxc_info
:
if
'RUNNING'
in
lxc_info
:
return
'started'
current_status
=
'started'
else
:
else
:
return
'stopped'
current_status
=
'stopped'
### If container is not launch, launch it
if
requested_status
!=
current_status
:
logger
.
debug
(
'Start lxc.'
)
lxc_start
=
os
.
path
.
join
(
sr_directory
,
'parts/lxc/bin/lxc-start'
)
call
([
lxc_start
,
'-f'
,
lxc_conf_filename
,
'-n'
,
name
,
'-d'
])
################################
# Stateless shellinabox launch #
################################
current_status
=
'stopped'
# Check if shellinabox is started
if
name
in
database
:
pid
=
int
(
database
[
name
])
if
is_pid_running
(
pid
):
current_status
=
'started'
if
current_status
==
'stopped'
:
logger
.
debug
(
'Start shellinabox.'
)
shellinabox_pid
=
call_daemonize
([
os
.
path
.
join
(
partition_path
,
'bin/shellinaboxd'
)])
database
[
name
]
=
str
(
shellinabox_pid
)
def
is_pid_running
(
pid
):
logger
=
logging
.
getLogger
(
'pid'
)
logger
.
debug
(
'Check if pid %d is running.'
,
pid
)
# XXX: Magic number 0 for no special signal
try
:
os
.
kill
(
pid
,
0
)
logger
.
debug
(
'%d is running.'
,
pid
)
return
True
except
OSError
:
# Process doesn't exists
logger
.
debug
(
'%d is not running.'
,
pid
)
return
False
def
call
(
command_line
,
override_environ
=
{}):
def
call
(
command_line
,
override_environ
=
{}):
logger
=
logging
.
getLogger
(
'commandline'
)
logger
=
logging
.
getLogger
(
'commandline'
)
...
@@ -111,3 +191,16 @@ def call(command_line, override_environ={}):
...
@@ -111,3 +191,16 @@ def call(command_line, override_environ={}):
out
=
process
.
stdout
.
read
()
out
=
process
.
stdout
.
read
()
logger
.
debug
(
'Output : %s.'
,
out
)
logger
.
debug
(
'Output : %s.'
,
out
)
return
out
return
out
def
call_daemonize
(
command_line
,
override_environ
=
{}):
logger
=
logging
.
getLogger
(
'daemon'
)
environ
=
dict
(
os
.
environ
)
environ
.
update
(
override_environ
)
daemon
=
subprocess
.
Popen
(
command_line
,
env
=
environ
)
logger
.
debug
(
'Daemonize as pid %d : %s'
,
daemon
.
pid
,
' '
.
join
(
command_line
))
return
daemon
.
pid
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment