Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hidra
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
Releases
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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
steinbac
hidra
Commits
fe92da8c
Commit
fe92da8c
authored
8 years ago
by
Manuela Kuhn
Browse files
Options
Downloads
Plain Diff
Merge branch 'hotfix-2.1.3' into develop
Conflicts: src/sender/dataFetchers/getFromFile.py
parents
6684e2f0
583e4bc9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
APIs/dataTransferAPI.py
+1
-1
1 addition, 1 deletion
APIs/dataTransferAPI.py
src/sender/dataFetchers/getFromFile.py
+14
-15
14 additions, 15 deletions
src/sender/dataFetchers/getFromFile.py
src/shared/version.py
+1
-1
1 addition, 1 deletion
src/shared/version.py
with
16 additions
and
17 deletions
APIs/dataTransferAPI.py
+
1
−
1
View file @
fe92da8c
# API to communicate with a data transfer unit
__version__
=
'
2.1.
2
'
__version__
=
'
2.1.
3
'
import
zmq
import
socket
...
...
This diff is collapsed.
Click to expand it.
src/sender/dataFetchers/getFromFile.py
+
14
−
15
View file @
fe92da8c
...
...
@@ -94,13 +94,13 @@ def getMetadata (log, metadata, chunkSize, localTarget = None):
def
sendData
(
log
,
targets
,
sourceFile
,
targetFile
,
metadata
,
openConnections
,
context
,
prop
):
if
not
targets
:
prop
[
"
removeFlag
"
]
=
False
return
targets_data
=
[
i
for
i
in
targets
if
i
[
2
]
==
"
data
"
]
chunkSize
=
metadata
[
"
chunkSize
"
]
if
not
targets_data
:
prop
[
"
removeFlag
"
]
=
True
return
targets_data
=
[
i
for
i
in
targets
if
i
[
2
]
==
"
data
"
]
chunkSize
=
metadata
[
"
chunkSize
"
]
chunkNumber
=
0
sendError
=
False
...
...
@@ -134,17 +134,16 @@ def sendData (log, targets, sourceFile, targetFile, metadata, openConnections, c
except
:
log
.
error
(
"
Unable to pack multipart-message for file
"
+
str
(
sourceFile
),
exc_info
=
True
)
if
targets_data
:
#send message to data targets
try
:
__sendToTargets
(
log
,
targets_data
,
sourceFile
,
targetFile
,
openConnections
,
None
,
chunkPayload
,
context
)
log
.
debug
(
"
Passing multipart-message for file
"
+
str
(
sourceFile
)
+
"
(chunk
"
+
str
(
chunkNumber
)
+
"
)...done.
"
)
#send message to data targets
try
:
__sendToTargets
(
log
,
targets_data
,
sourceFile
,
targetFile
,
openConnections
,
None
,
chunkPayload
,
context
)
log
.
debug
(
"
Passing multipart-message for file
"
+
str
(
sourceFile
)
+
"
(chunk
"
+
str
(
chunkNumber
)
+
"
)...done.
"
)
except
DataHandlingError
:
log
.
error
(
"
Unable to send multipart-message for file
"
+
str
(
sourceFile
)
+
"
(chunk
"
+
str
(
chunkNumber
)
+
"
)
"
,
exc_info
=
True
)
sendError
=
True
except
:
log
.
error
(
"
Unable to send multipart-message for file
"
+
str
(
sourceFile
)
+
"
(chunk
"
+
str
(
chunkNumber
)
+
"
)
"
,
exc_info
=
True
)
except
DataHandlingError
:
log
.
error
(
"
Unable to send multipart-message for file
"
+
str
(
sourceFile
)
+
"
(chunk
"
+
str
(
chunkNumber
)
+
"
)
"
,
exc_info
=
True
)
sendError
=
True
except
:
log
.
error
(
"
Unable to send multipart-message for file
"
+
str
(
sourceFile
)
+
"
(chunk
"
+
str
(
chunkNumber
)
+
"
)
"
,
exc_info
=
True
)
chunkNumber
+=
1
...
...
This diff is collapsed.
Click to expand it.
src/shared/version.py
+
1
−
1
View file @
fe92da8c
__version__
=
'
2.1.
2
'
__version__
=
'
2.1.
3
'
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