Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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
Boxiang Sun
slapos.core
Commits
a9811f43
Commit
a9811f43
authored
Mar 06, 2023
by
Boxiang Sun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show the failed service in the testsuit.log instead of instance.log
parent
930cfecb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
12 deletions
+6
-12
slapos/grid/SlapObject.py
slapos/grid/SlapObject.py
+1
-6
slapos/grid/slapgrid.py
slapos/grid/slapgrid.py
+5
-6
No files found.
slapos/grid/SlapObject.py
View file @
a9811f43
...
@@ -885,10 +885,6 @@ class Partition(object):
...
@@ -885,10 +885,6 @@ class Partition(object):
Check all on-watch service status,
Check all on-watch service status,
if any of them is not RUNNING, raise Exception and stop
if any of them is not RUNNING, raise Exception and stop
"""
"""
print
(
"=============Service Debug=========="
)
print
(
"===================================="
)
print
(
"===================================="
)
print
(
"===================================="
)
service_list
=
[]
service_list
=
[]
if
os
.
path
.
exists
(
self
.
service_path
):
if
os
.
path
.
exists
(
self
.
service_path
):
if
os
.
path
.
isdir
(
self
.
service_path
):
if
os
.
path
.
isdir
(
self
.
service_path
):
...
@@ -905,8 +901,7 @@ class Partition(object):
...
@@ -905,8 +901,7 @@ class Partition(object):
if
'on-watch'
in
process
[
'name'
]
and
process
[
'statename'
]
!=
"RUNNING"
:
if
'on-watch'
in
process
[
'name'
]
and
process
[
'statename'
]
!=
"RUNNING"
:
self
.
logger
.
info
(
'On watch service %r is not running'
%
process
[
'name'
])
self
.
logger
.
info
(
'On watch service %r is not running'
%
process
[
'name'
])
bad_service_list
.
append
(
process
[
'name'
])
bad_service_list
.
append
(
process
[
'name'
])
if
len
(
bad_service_list
)
>
0
:
return
bad_service_list
raise
ChildProcessError
(
"Some on-watch process is not running!"
)
def
cleanupFolder
(
self
,
folder_path
):
def
cleanupFolder
(
self
,
folder_path
):
"""Delete all files and folders in a specified directory
"""Delete all files and folders in a specified directory
...
...
slapos/grid/slapgrid.py
View file @
a9811f43
...
@@ -1292,7 +1292,11 @@ stderr_logfile_backups=1
...
@@ -1292,7 +1292,11 @@ stderr_logfile_backups=1
if
not
self
.
force_stop
:
if
not
self
.
force_stop
:
self
.
_checkPromiseList
(
local_partition
)
self
.
_checkPromiseList
(
local_partition
)
computer_partition
.
started
()
computer_partition
.
started
()
local_partition
.
checkOnWatchServiceStatus
()
bad_service_list
=
local_partition
.
checkOnWatchServiceStatus
()
if
len
(
bad_service_list
)
>
0
:
raise
ChildProcessError
(
"The folling on-watch process is not running!"
)
for
service
in
bad_service_list
:
self
.
logger
.
info
(
'On watch service %r is not running'
%
service
)
self
.
_endInstallationTransaction
(
computer_partition
)
self
.
_endInstallationTransaction
(
computer_partition
)
elif
computer_partition_state
==
COMPUTER_PARTITION_STOPPED_STATE
:
elif
computer_partition_state
==
COMPUTER_PARTITION_STOPPED_STATE
:
try
:
try
:
...
@@ -1490,11 +1494,6 @@ stderr_logfile_backups=1
...
@@ -1490,11 +1494,6 @@ stderr_logfile_backups=1
except
slapos
.
slap
.
ResourceNotReady
:
except
slapos
.
slap
.
ResourceNotReady
:
return
'(not ready)'
return
'(not ready)'
self
.
logger
.
info
(
'---------------------------------'
)
self
.
logger
.
info
(
'---------------------------------'
)
self
.
logger
.
info
(
'---------------------------------'
)
self
.
logger
.
info
(
'I want generate an output here!!!'
)
self
.
logger
.
info
(
'Finished computer partitions.'
)
self
.
logger
.
info
(
'Finished computer partitions.'
)
self
.
logger
.
info
(
'='
*
80
)
self
.
logger
.
info
(
'='
*
80
)
if
process_error_partition_list
:
if
process_error_partition_list
:
...
...
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