Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nomad-lab
nomad-lab-base
Commits
67ee3a7d
Commit
67ee3a7d
authored
Oct 04, 2018
by
Mohamed, Fawzi Roberto (fawzi)
Browse files
archive indexing fixes
parent
88cd2502
Changes
3
Hide whitespace changes
Inline
Side-by-side
archive/archive-tool/src/main/docker/indexWorker.sh
View file @
67ee3a7d
...
...
@@ -3,21 +3,20 @@
cmd
=
"java -Djava.library.path=/lib -jar /app/archiveTool.jar"
baseName
=
${
baseName
:-
toIndex
-
}
globPattern
=
${
globPattern
:-
??
}
indexName
=
if
[
-n
"
$indexName
"
]
;
then
indexFlags
=
"--indexName=
$indexName
"
fi
if
[
-e
/config.sh
]
;
then
source
/config.sh
fi
cmdArgs
=
${
cmdArgs
:-
indexArchives
--source-path
s-file=
${
!
f
}}
cmdArgs
=
${
cmdArgs
:-
indexArchives
$indexFlags
--archive-gid
s-file=
\
${
f
}}
cd
/work
for
f
in
/work/
$baseName$globPattern
;
do
(
if
[[
-e
"
$f
"
]]
;
then
command
=
$(
eval echo
-e
$cmd
$cmdArgs
)
$c
md
$cmdArgs
>
&
"out-
$(
basename
$f
)
.txt"
$c
ommand
>
&
"out-
$(
basename
$f
)
.txt"
fi
)
&
done
...
...
archive/archive-tool/src/main/scala/eu/nomad_lab/archive/ArchiveTool.scala
View file @
67ee3a7d
...
...
@@ -183,7 +183,7 @@ object ArchiveTool extends StrictLogging {
val
today
=
ZonedDateTime
.
now
(
java
.
time
.
ZoneId
.
systemDefault
()).
toLocalDate
var
indexNameData
=
"archive"
+
today
var
archives
=
Seq
[
String
]()
val
archiveGidsFileRe
=
"^--archive-gids-file=(.)$"
.
r
val
archiveGidsFileRe
=
"^--archive-gids-file=(.
+
)$"
.
r
while
(
list
.
nonEmpty
)
{
val
arg
=
list
.
head
list
=
list
.
tail
...
...
core/src/main/resources/reference.conf
View file @
67ee3a7d
...
...
@@ -362,12 +362,20 @@ kubernetes_prod.nomad_lab {
indexNameData
=
"archive"
}
archive
{
elastic
{
clientUri
=
"elasticsearch://nomad-flink-02.esc:9200"
}
webservice
{
protocol
:
"https://"
hostName
:
"analytics-toolkit.nomad-coe.eu"
rootPath
:
""
}
}
repo
{
elastic
{
clientUri
=
"elasticsearch://localhost:9200"
}
}
}
//
only
used
to
expose
the
simpleStats
API
call
while
we
need
to
keep
the
old
version
running
kubernetes_prod_dev_archive
.
nomad_lab
{
...
...
Write
Preview
Supports
Markdown
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