Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Yusei Tahara
slapos
Commits
fe4ad9d1
Commit
fe4ad9d1
authored
Nov 10, 2017
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use inotify-simple instead of inotifyx
inotifyx does not support Python 3.
parent
b184f687
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
101 additions
and
53 deletions
+101
-53
setup.py
setup.py
+2
-1
slapos/recipe/librecipe/execute.py
slapos/recipe/librecipe/execute.py
+19
-35
slapos/recipe/librecipe/inotify.py
slapos/recipe/librecipe/inotify.py
+7
-14
slapos/test/recipe/test_inotify.py
slapos/test/recipe/test_inotify.py
+72
-0
software/unstable/condor/software.cfg
software/unstable/condor/software.cfg
+0
-1
software/unstable/zimbra-kvm/software.cfg
software/unstable/zimbra-kvm/software.cfg
+0
-1
stack/slapos.cfg
stack/slapos.cfg
+1
-1
No files found.
setup.py
View file @
fe4ad9d1
...
...
@@ -55,11 +55,12 @@ setup(name=name,
packages
=
find_packages
(),
include_package_data
=
True
,
install_requires
=
[
'enum34'
,
# for inotify-simple
'jsonschema'
,
'hexagonit.recipe.download'
,
'netaddr'
,
# to manipulate on IP addresses
'setuptools'
,
# namespaces
'inotify
x'
,
# XXX use pyinotify instead
'inotify
-simple'
,
'lock_file'
,
#another lockfile implementation for multiprocess
'slapos.core'
,
# uses internally
'zc.buildout'
,
# plays with buildout
...
...
slapos/recipe/librecipe/execute.py
View file @
fe4ad9d1
...
...
@@ -3,47 +3,31 @@ import os
import
signal
import
subprocess
import
time
import
inotifyx
from
collections
import
defaultdict
from
inotify_simple
import
INotify
,
flags
def
_wait_files_creation
(
file_list
):
# Etablish a list of directory and subfiles
directories
=
dict
()
for
dirname
,
filename
in
[
os
.
path
.
split
(
f
)
for
f
in
file_list
]:
directories
.
setdefault
(
dirname
,
dict
())
directories
[
dirname
][
filename
]
=
False
# Establish a list of directory and subfiles.
# and test existence before watching, so that we don't miss an event.
directories
=
defaultdict
(
dict
)
for
f
in
file_list
:
dirname
,
filename
=
os
.
path
.
split
(
f
)
directories
[
dirname
][
filename
]
=
os
.
path
.
lexists
(
f
)
def
all_files_exists
():
return
all
(
[
all
(
files
.
values
())
for
files
in
directories
.
values
()]
)
return
all
(
all
(
files
.
itervalues
())
for
files
in
directories
.
itervalues
()
)
fd
=
inotifyx
.
init
()
try
:
# Watch every directories where the file are
watchdescriptors
=
dict
()
for
dirname
in
directories
.
keys
():
wd
=
inotifyx
.
add_watch
(
fd
,
dirname
,
inotifyx
.
IN_CREATE
|
inotifyx
.
IN_DELETE
|
inotifyx
.
IN_MOVE
)
watchdescriptors
[
wd
]
=
dirname
# Set to True the file wich exists
for
dirname
,
filename
in
[
os
.
path
.
split
(
f
)
for
f
in
file_list
]:
directories
[
dirname
][
filename
]
=
os
.
path
.
exists
(
os
.
path
.
join
(
dirname
,
filename
))
# Let's wait for every file creation
while
not
all_files_exists
():
events_list
=
inotifyx
.
get_events
(
fd
)
for
event
in
events_list
:
dirname
=
watchdescriptors
[
event
.
wd
]
if
event
.
name
in
directories
[
dirname
]:
# One of watched file was created or deleted
if
event
.
mask
&
inotifyx
.
IN_DELETE
:
directories
[
dirname
][
event
.
name
]
=
False
else
:
directories
[
dirname
][
event
.
name
]
=
True
with
INotify
()
as
inotify
:
watchdescriptors
=
{
inotify
.
add_watch
(
dirname
,
flags
.
CREATE
|
flags
.
DELETE
|
flags
.
MOVED_TO
|
flags
.
MOVED_FROM
):
dirname
for
dirname
in
directories
}
finally
:
os
.
close
(
fd
)
while
not
all_files_exists
():
for
event
in
inotify
.
read
():
directory
=
directories
[
watchdescriptors
[
event
.
wd
]]
if
event
.
name
in
directory
:
directory
[
event
.
name
]
=
event
.
mask
&
(
flags
.
CREATE
|
flags
.
MOVED_TO
)
def
execute
(
args
):
"""Portable execution with process replacement"""
...
...
slapos/recipe/librecipe/inotify.py
View file @
fe4ad9d1
...
...
@@ -25,8 +25,7 @@
#
##############################################################################
import
os
import
inotifyx
from
inotify_simple
import
INotify
,
flags
def
subfiles
(
directory
):
"""Return the list of subfiles of a directory, and wait for the newly created
...
...
@@ -34,18 +33,12 @@ def subfiles(directory):
CAUTION : *DONT TRY TO CONVERT THE RESULT OF THIS FUNCTION INTO A LIST !
ALWAYS ITERATE OVER IT !!!*"""
watchfd
=
inotifyx
.
init
()
inotifyx
.
add_watch
(
watchfd
,
directory
,
inotifyx
.
IN_CREATE
)
try
:
subfiles
=
set
(
os
.
listdir
(
directory
))
subfiles
|=
set
([
file_
.
name
for
file_
in
inotifyx
.
get_events
(
watchfd
,
0
)]
)
with
INotify
()
as
inotify
:
inotify
.
add_watch
(
directory
,
flags
.
CLOSE_WRITE
|
flags
.
MOVED_TO
)
names
=
os
.
listdir
(
directory
)
while
True
:
for
file_
in
subfiles
:
yield
os
.
path
.
join
(
directory
,
file_
)
subfiles
=
[
file_
.
name
for
file_
in
inotifyx
.
get_events
(
watchfd
)]
finally
:
os
.
close
(
watchfd
)
for
name
in
names
:
yield
os
.
path
.
join
(
directory
,
name
)
names
=
(
event
.
name
for
event
in
inotify
.
read
())
slapos/test/recipe/test_inotify.py
0 → 100644
View file @
fe4ad9d1
import
os
,
shutil
,
tempfile
,
threading
,
unittest
from
slapos.recipe.librecipe
import
execute
,
inotify
class
TestInotify
(
unittest
.
TestCase
):
def
setUp
(
self
):
self
.
tmp
=
tempfile
.
mkdtemp
()
def
tearDown
(
self
):
shutil
.
rmtree
(
self
.
tmp
)
def
test_subfiles
(
self
):
p
=
lambda
x
:
os
.
path
.
join
(
self
.
tmp
,
x
)
def
create
(
name
,
text
):
a
=
open
(
p
(
name
),
'w'
)
a
.
write
(
text
)
a
.
flush
()
return
a
def
check
(
name
,
text
):
path
=
next
(
notified
)
self
.
assertEqual
(
path
,
p
(
name
))
with
open
(
path
)
as
f
:
self
.
assertEqual
(
f
.
read
(),
text
)
a
=
create
(
'first'
,
'blah'
)
a
.
write
(
'...'
)
notified
=
inotify
.
subfiles
(
self
.
tmp
)
check
(
'first'
,
'blah'
)
os
.
link
(
p
(
a
.
name
),
p
(
'a hard link'
))
# ignored
b
=
create
(
'other'
,
'hello'
)
b
.
close
()
check
(
'other'
,
'hello'
)
c
=
create
(
'last'
,
'!!!'
)
a
.
close
()
check
(
'first'
,
'blah...'
)
os
.
rename
(
p
(
a
.
name
),
p
(
b
.
name
))
check
(
'other'
,
'blah...'
)
c
.
close
()
check
(
'last'
,
'!!!'
)
def
test_wait_files_creation
(
self
):
file_list
=
(
'foo'
,
'bar'
,
'hello/world'
,
'hello/world!'
,
'a/b/c'
,
)
create
=
lambda
x
:
open
(
x
,
'w'
).
close
()
p
=
lambda
x
:
os
.
path
.
join
(
self
.
tmp
,
x
)
P
=
lambda
x
:
p
(
file_list
[
x
])
create
(
P
(
1
))
os
.
mkdir
(
p
(
'hello'
))
os
.
makedirs
(
p
(
'a/b'
))
t
=
threading
.
Thread
(
target
=
execute
.
_wait_files_creation
,
args
=
(
map
(
p
,
file_list
),))
t
.
daemon
=
True
t
.
start
()
def
check
():
t
.
join
(.
2
)
self
.
assertTrue
(
t
.
is_alive
())
check
()
for
x
in
P
(
3
),
p
(
'a/b/d'
),
P
(
0
):
create
(
x
)
check
()
os
.
rename
(
P
(
3
),
P
(
2
))
os
.
rename
(
p
(
'a/b/d'
),
P
(
4
))
check
()
os
.
remove
(
P
(
1
))
for
x
in
P
(
3
),
P
(
1
):
create
(
x
)
t
.
join
(
10
)
self
.
assertFalse
(
t
.
is_alive
())
software/unstable/condor/software.cfg
View file @
fe4ad9d1
...
...
@@ -51,7 +51,6 @@ MarkupSafe = 0.18
Werkzeug = 0.8.3
buildout-versions = 1.7
hexagonit.recipe.cmmi = 2.0
inotifyx = 0.2.0-1
lxml = 3.2.1
meld3 = 0.6.10
netaddr = 0.7.10
...
...
software/unstable/zimbra-kvm/software.cfg
View file @
fe4ad9d1
...
...
@@ -44,7 +44,6 @@ hexagonit.recipe.download = 1.6nxd002
# Required by:
# slapos.cookbook==0.73.1
inotifyx = 0.2.0
# Required by:
# slapos.cookbook==0.73.1
...
...
stack/slapos.cfg
View file @
fe4ad9d1
...
...
@@ -111,7 +111,7 @@ collective.recipe.template = 2.0
cryptography = 2.1.1
decorator = 4.0.11
idna = 2.2
inotify
x = 0.2.2
inotify
-simple = 1.1.1
itsdangerous = 0.24
lock-file = 2.0
lxml = 3.7.3
...
...
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