Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vospace-transfer-service
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VOSpace INAF
vospace-transfer-service
Commits
ea90966e
Commit
ea90966e
authored
May 28, 2021
by
Cristiano Urban
Browse files
Options
Downloads
Patches
Plain Diff
Removed huge annoying logs.
Signed-off-by:
Cristiano Urban
<
cristiano.urban@inaf.it
>
parent
95d3b29e
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
transfer_service/import_executor.py
+11
-10
11 additions, 10 deletions
transfer_service/import_executor.py
with
11 additions
and
10 deletions
transfer_service/import_executor.py
+
11
−
10
View file @
ea90966e
...
...
@@ -55,7 +55,7 @@ class ImportExecutor(TaskExecutor):
nodeListFile
=
"
vos_import_report-
"
+
timestamp
nlfp
=
open
(
nodeListFile
,
"
w
"
)
out
=
open
(
"
import_amqp_server_log.txt
"
,
"
a
"
)
#
out = open("import_amqp_server_log.txt", "a")
if
self
.
storageType
==
"
cold
"
:
self
.
tapeClient
.
connect
()
self
.
tapeClient
.
recallChecksumFiles
(
self
.
path
)
...
...
@@ -65,8 +65,8 @@ class ImportExecutor(TaskExecutor):
tstampWrapperDirPattern
=
re
.
compile
(
"
/[0-9]{4}_[0-9]{2}_[0-9]{2}-[0-9]{2}_[0-9]{2}_[0-9]{2}-vos_wrapper
"
)
for
dir
in
dirs
:
out
.
write
(
f
"
DIR dir:
{
dir
}
\n
"
)
out
.
write
(
f
"
DIR pathPrefix:
{
self
.
pathPrefix
}
\n\n
"
)
#
out.write(f"DIR dir: {dir}\n")
#
out.write(f"DIR pathPrefix: {self.pathPrefix}\n\n")
if
self
.
path
in
dir
:
parentPath
=
os
.
path
.
dirname
(
dir
).
split
(
self
.
pathPrefix
)[
1
]
...
...
@@ -103,14 +103,14 @@ class ImportExecutor(TaskExecutor):
for
flist
in
files
:
for
file
in
flist
:
if
self
.
md5calc
.
fileIsValid
(
file
)
and
self
.
path
in
os
.
path
.
dirname
(
file
):
out
.
write
(
f
"
FILE files:
{
files
}
\n
"
)
out
.
write
(
f
"
FILE flist:
{
flist
}
\n
"
)
out
.
write
(
f
"
FILE file:
{
file
}
\n
"
)
out
.
write
(
f
"
FILE pathPrefix:
{
self
.
pathPrefix
}
\n
"
)
#
out.write(f"FILE files: {files}\n")
#
out.write(f"FILE flist: {flist}\n")
#
out.write(f"FILE file: {file}\n")
#
out.write(f"FILE pathPrefix: {self.pathPrefix}\n")
parentPath
=
os
.
path
.
dirname
(
file
).
split
(
self
.
pathPrefix
)[
1
]
out
.
write
(
f
"
FILE parentPath:
{
parentPath
}
\n
"
)
#
out.write(f"FILE parentPath: {parentPath}\n")
nodeName
=
os
.
path
.
basename
(
file
)
out
.
write
(
f
"
FILE nodeName:
{
nodeName
}
\n
"
)
#
out.write(f"FILE nodeName: {nodeName}\n")
dnode
=
Node
(
nodeName
,
"
data
"
)
if
tstampWrapperDirPattern
.
search
(
parentPath
):
...
...
@@ -119,7 +119,7 @@ class ImportExecutor(TaskExecutor):
dnode
.
setWrapperDir
(
tstampWrapperDir
)
vospacePath
=
parentPath
+
'
/
'
+
nodeName
out
.
write
(
f
"
FILE vospacePath:
{
vospacePath
}
\n
"
)
#
out.write(f"FILE vospacePath: {vospacePath}\n")
dnode
.
setParentPath
(
parentPath
)
self
.
storageId
=
self
.
dbConn
.
getStorageId
(
self
.
pathPrefix
)
locationId
=
self
.
dbConn
.
getLocationId
(
self
.
storageId
)
...
...
@@ -136,6 +136,7 @@ class ImportExecutor(TaskExecutor):
else
:
now
=
dt
.
now
()
nodeList
.
append
([
now
,
file
,
vospacePath
,
"
data
"
,
"
SKIP
"
])
#out.close()
nlfp
.
write
(
tabulate
(
nodeList
,
headers
=
[
"
Timestamp
"
,
"
OS path
"
,
"
VOSpace path
"
,
"
Node type
"
,
"
Result
"
],
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment