- Fix the process of shutting down the worker, in case the user sends the relevant request, while the worker is stuck in a data-request error-loop.

- Upload the updated gradle-wrapper.

LICENSE

@@ -0,0 +1,201 @@
+ Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2021-2024 OpenAIRE AMKE
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,4 +1,5 @@
 # UrlsWorker
+### [![Jenkins build status](https://jenkins-dnet.d4science.org/buildStatus/icon?job=UrlsWorker)](https://jenkins-dnet.d4science.org/job/UrlsWorker/)
 
 The Worker's Application, requests assignments from the [**Controller**](https://code-repo.d4science.org/lsmyrnaios/UrlsController) and processes them with the help of the [__PublicationsRetriever__](https://github.com/LSmyrnaios/PublicationsRetriever) software and downloads the available full-texts.<br>
 Then, it posts the results to the Controller, which in turn, requests from the Worker, the full-texts which are not already found by other workers, in batches.<br>
@@ -16,9 +17,5 @@ We use Facebook's [**Zstandard**](https://facebook.github.io/zstd/) compression
 <br>
 
 **Notes**:
-- The above script, installs the [PublicationsRetriever](https://github.com/LSmyrnaios/PublicationsRetriever) software, as a library and then compiles and runs the whole Application.<br>
-- If you want to just run the app, then run the script with the argument "1": ```./installAndRun.sh 1```. In this scenario, apart from the SpringBoot-app not re-building,
-the [PublicationsRetriever](https://github.com/LSmyrnaios/PublicationsRetriever) software, will not be re-installed as well.<br>
-- If you want to avoid re-installing the [PublicationsRetriever](https://github.com/LSmyrnaios/PublicationsRetriever) software, but still building the Worker's application, run the script with the argument "0", followed by the argument "1": ```./installAndRun.sh 0 1```, i.e. when using a development (non-published) version
-or when nothing has changed and wanting to avoid the time-overhead.<br>
+- If you want to just run the app, then run the script with the argument "1": ```./installAndRun.sh 1```. In this scenario, the SpringBoot-app will not be re-built.<br>
 <br>

build.gradle

@@ -1,20 +1,25 @@
 plugins {
-    id 'org.springframework.boot' version '2.7.13'
-    id 'io.spring.dependency-management' version '1.1.0'
+    id 'org.springframework.boot' version '2.7.18'
+    id 'io.spring.dependency-management' version '1.1.4'
     id 'java'
 }
 
 java {
     group = 'eu.openaire.urls_worker'
-    version = '2.1.0-SNAPSHOT'
-    sourceCompatibility = '1.8'
+    version = '2.1.9-SNAPSHOT'
+    sourceCompatibility = JavaVersion.VERSION_1_8
 }
 
 repositories {
     mavenCentral()
-    flatDir {
-        dirs 'libs'
+    maven {
+        name "d4science"
+        url "https://maven.d4science.org/nexus/content/repositories/dnet45-snapshots/"
     }
+    // Enable the following, in case you want to test temporal-jars.
+    /*flatDir {
+        dirs 'libs'
+    }*/
 }
 
 dependencies {
@@ -32,20 +37,23 @@ dependencies {
     // Enable the validation annotations.
     //implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: '3.0.2'
 
-    implementation ("eu.openaire:publications_retriever:1.1-SNAPSHOT") {
+    implementation ("eu.openaire:publications_retriever:1.2-SNAPSHOT") {
         exclude group: 'ch.qos.logback', module: 'logback-core'
         exclude group: 'ch.qos.logback', module: 'logback-classic'
         exclude group: 'org.slf4j', module: 'slf4j-api'
         exclude group: 'io.minio'   // This is not used in the Worker, since it's the Controller which uploads the full-texts to S3. It also includes an older "commons-compress" version which causes problems.
     }
 
-    implementation group: 'com.google.guava', name: 'guava', version: '32.1.1-jre'
+    implementation group: 'com.google.guava', name: 'guava', version: '33.1.0-jre'
 
     // https://mvnrepository.com/artifact/com.google.code.gson/gson
     implementation 'com.google.code.gson:gson:2.10.1'
 
-    implementation 'org.apache.commons:commons-compress:1.23.0'
-    implementation 'com.github.luben:zstd-jni:1.5.5-4'  // Even though this is part of the above dependency, it is needed separately as well, specifically here, in the Worker.
+    implementation("org.apache.commons:commons-compress:1.26.1") {
+        exclude group: 'com.github.luben', module: 'zstd-jni'
+    }
+    implementation 'com.github.luben:zstd-jni:1.5.6-3'  // Even though this is part of the above dependency, the Apache commons rarely updates it, while the zstd team makes improvements very often.
+    // Also, for compressing, we strangely need it to be explicitly declared independently, otherwise it does not work.
 
     testImplementation 'org.springframework.security:spring-security-test'
     testImplementation "org.springframework.boot:spring-boot-starter-test"

createSwapStorage.sh

@@ -21,5 +21,5 @@ echo '/swapfile none swap sw 0 0' | sudo tee -a /etc/fstab
 
 # Adjusting the Swappiness Property
 cat /proc/sys/vm/swappiness
-sudo sysctl vm.swappiness=10  # Setting it closer to 0, makes the swaps more rare. (10 %)
+sudo sysctl vm.swappiness=10  # Setting it closer to 0, makes the swaps more rare: 10%. The default is 60%.
 echo "vm.swappiness=10" | sudo tee -a /etc/sysctl.conf  # Append it to that file in order for the custom "swappiness" to be available on restart.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -0,0 +1,249 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

installAndRun.sh

@@ -11,61 +11,26 @@ handle_error () {
 cd "${0%/*}" || handle_error "Could not change-dir to this script's dir!" 1
 
 justRun=0
-avoidReInstallingPublicationsRetriever=0
 
 if [[ $# -eq 1 ]]; then
 	justRun=$1
-elif [[ $# -eq 2 ]]; then
-  justRun=$1
-  avoidReInstallingPublicationsRetriever=$2
-elif [[ $# -gt 2 ]]; then
-	echo -e "Wrong number of arguments given: ${#} (more than 2)\nPlease execute it like: script.sh <justRun: 0 | 1> <avoidReInstallingPublicationsRetriever: 0 | 1>";	exit 2
+elif [[ $# -gt 1 ]]; then
+	echo -e "Wrong number of arguments given: ${#} (more than 1)\nPlease execute it like: script.sh <justRun: 0 | 1>";	exit 2
 fi
 
-gradleVersion="8.2"
+gradleVersion="8.7"
 
 shouldBeCarefulWithMaxHeap=0 # This is NOT a cmd-arg.
 
 if [[ justRun -eq 0 ]]; then
 
-  if [[ avoidReInstallingPublicationsRetriever -eq 1 ]]; then
-    if [[ ! -f ./libs/publications_retriever-1.1-SNAPSHOT.jar ]]; then
-      echo -e "\n\nThe required \"PublicationsRetriever\" software has not been installed yet, thus the script will override the user-defined value of \"avoidReInstallingPublicationsRetriever\" to FALSE..\n\n"
-      avoidReInstallingPublicationsRetriever=0; # In case the jar-file does not exists, then make sure we follow the normal procedure, independently from what the user requested.
-    fi
-  fi
-
-  if [[ avoidReInstallingPublicationsRetriever -eq 0 ]]; then
-
-      if [ ! -d libs ]; then
-        mkdir libs || handle_error "The directory \"libs\" could not be created! Exiting.." 3
-      fi
-      cd libs || exit 4
-      git clone https://github.com/LSmyrnaios/PublicationsRetriever.git # We assume there is no previously source-code here, if so, it will be overwritten.
-
-      # Keep a backup of the previous JAR file, if it exists.
-      if [ -f ./publications_retriever-1.1-SNAPSHOT.jar ]; then
-        mv ./publications_retriever-1.1-SNAPSHOT.jar ./publications_retriever-1.1-SNAPSHOT_BACKUP.jar
-      fi
-
-      cd PublicationsRetriever && sudo apt install -y maven && mvn clean install
-
-      # Copy the created JAR file to the top libs directory.
-      cp target/publications_retriever-1.1-SNAPSHOT.jar ../publications_retriever-1.1-SNAPSHOT.jar
-
-      # Delete the directory with the source-code.
-      cd ../ && rm -rf PublicationsRetriever
-
-      # Clean, (re)build and run the project.
-      cd ../
-  fi
-
   # Install the specified Gradle-build-tool version, if it does not exist.
   if [[ ! -d /opt/gradle/gradle-${gradleVersion} ]]; then
     wget https://services.gradle.org/distributions/gradle-${gradleVersion}-bin.zip
     echo -e "\nAsking for sudo, in order to install 'gradle'..\n"
     sudo mkdir /opt/gradle
     sudo apt install -y unzip && sudo unzip -d /opt/gradle gradle-${gradleVersion}-bin.zip
+    sudo rm -rf gradle-${gradleVersion}-bin.zip
     #ls /opt/gradle/gradle-${gradleVersion}  # For debugging installation
   fi
 
@@ -85,7 +50,7 @@ if [[ justRun -eq 0 ]]; then
   #gradle tasks  # For debugging installation
   #gradle -v # For debugging installation
 
-  gradle clean build
+  gradle clean build # --refresh-dependencies # --info
 else
   export PATH=/opt/gradle/gradle-${gradleVersion}/bin:$PATH # Make sure the gradle is still accessible (it usually isn't without the "export").
 fi

src/main/java/eu/openaire/urls_worker/components/AssignmentsHandler.java

@@ -31,6 +31,7 @@ import java.nio.file.Paths;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -46,7 +47,7 @@ public class AssignmentsHandler {
     private final String workerId;
     private final String controllerBaseUrl;
     private final int maxAssignmentsLimitPerBatch;
-    private final int maxAssignmentsBatchesToHandleBeforeShutdown;
+    public final int maxAssignmentsBatchesToHandleBeforeShutdown;
 
     public static List<UrlReport> urlReports = null;
     private static final int expectedDatasourcesPerRequest = 1400;  // Per 10_000 assignments.
@@ -102,16 +103,16 @@ public class AssignmentsHandler {
 
     public AssignmentsRequest requestAssignments()
     {
-        logger.info("Going to request " + this.maxAssignmentsLimitPerBatch + " assignments from the Controller: " + requestUrl);
+        logger.info("Going to request up to " + this.maxAssignmentsLimitPerBatch + " assignments from the Controller: " + requestUrl);
         AssignmentsRequest assignmentRequest = null;
         try {   // Here, the HTTP-request is executed.
             assignmentRequest = restTemplate.getForObject(requestUrl, AssignmentsRequest.class);
         } catch (RestClientException rce) {
-            logger.error("Could not retrieve the assignments!\n" + rce.getMessage());   // It shows the response body (from Spring v.2.5.6 onwards).
+            logger.error("Could not retrieve the assignments! " + rce.getMessage());    // The exMsg also shows the response body of the response (from Spring v.2.5.6 onwards).
             hadConnectionErrorOnRequest = true;
             return null;
         } catch (IllegalArgumentException iae) {
-            logger.error("Could not retrieve the assignments, as the provided Controller's url was malformed!\n" + iae.getMessage());
+            logger.error("Could not retrieve the assignments, as the provided Controller's url was malformed! " + iae.getMessage());
             // We do not need to send a "ShutdownReport" to the Controller, since this error will appear upon the Worker's initialization and the Controller will not have any information about this Worker's existence.
             UrlsWorkerApplication.gentleAppShutdown();
         }
@@ -145,7 +146,7 @@ public class AssignmentsHandler {
             return;
         }
 
-        logger.info("AssignmentRequest < " + assignmentRequestCounter + " > was received and it's ready to be processed. It contains " + assignmentsSize + " tasks.");
+        logger.info("AssignmentRequest < " + assignmentRequestCounter + " > was received and it's ready to be processed. It contains " + assignmentsSize + " assignments.");
 
         Instant startTime = Instant.now();
 
@@ -154,9 +155,8 @@ public class AssignmentsHandler {
 
         assignments = getAssignmentsSpacedOutByDomain(assignments, assignmentsSize, false);
 
-        // Iterate over the tasks and add each task in its own list depending on the DATASOURCE in order to decide which plugin to use later.
+        // Iterate over the assignments and add each assignment in its own list depending on the DATASOURCE in order to decide which plugin to use later.
         for ( Assignment assignment : assignments ) {
-            // Add each task in its own HashSet.
             try {
                 assignmentsForPlugins.put(assignment.getDatasource().getId(), assignment);
             } catch (NullPointerException npe) {
@@ -166,12 +166,12 @@ public class AssignmentsHandler {
 
         //countDatasourcesAndRecords(assignmentsSize);    // Only for DEBUG! Keep it commented in normal run.
 
-        // TODO - Decide which tasks run with what plugin (depending on their datasource).
-        // First run -in parallel- the tasks which require some specific plugin.
-        // Then, after the above plugins are finished, run the remaining tasks in the generic plugin (which handles parallelism itself).
+        // TODO - Decide which assignments should run with what plugin (depending on their datasource).
+        // First run -in parallel- the assignments which require some specific plugin.
+        // Then, after the above plugins are finished, run the remaining assignments in the generic plugin (which handles parallelism itself).
         // TODO - If we have more than one plugin running at the same time, then make the "AssignmentsHandler.urlReports"-list thread-safe.
 
-        // For now, let's just run all tasks in the generic plugin.
+        // For now, let's just run all assignments in the generic plugin.
         try {
             publicationsRetrieverPlugin.processAssignments(assignmentRequestCounter, assignmentsForPlugins.values());
         } catch (Exception e) {
@@ -179,7 +179,7 @@ public class AssignmentsHandler {
             return;
         }   // In this case, no assignments were processed.
 
-        PublicationsRetriever.calculateAndPrintElapsedTime(startTime, Instant.now(), "The processing of assignments_" + assignmentRequestCounter + " finished after: ");
+        PublicationsRetriever.calculateAndPrintElapsedTime(startTime, Instant.now(), "The processing of assignments_" + assignmentRequestCounter + " (containing " + assignmentsSize + " assignments) finished after: ");
 
         if ( askForTest ) {
             logger.debug("UrlReports:");  // DEBUG!
@@ -227,7 +227,7 @@ public class AssignmentsHandler {
     }
 
 
-    public static HashSet<Long> assignmentsNumsHandled = new HashSet<>();
+    public static final Set<Long> handledAssignmentsCounters = Collections.newSetFromMap(new ConcurrentHashMap<Long, Boolean>());
 
 
     /**
@@ -251,7 +251,7 @@ public class AssignmentsHandler {
             int responseCode = responseEntity.getStatusCodeValue();
             if ( responseCode == HttpStatus.OK.value() ) {
                 logger.info("The submission of the WorkerReport of assignments_" + assignmentRequestCounter + " to the Controller, was successful.");
-                assignmentsNumsHandled.add(assignmentRequestCounter);
+                handledAssignmentsCounters.add(assignmentRequestCounter);
                 return true;
             } else {    //  This does not include HTTP-5XX errors. For them an "HttpServerErrorException" is thrown.
                 logger.error("HTTP-Connection problem with the submission of the WorkerReport of assignments_" + assignmentRequestCounter + " to the Controller! Error-code was: " + responseCode);

src/main/java/eu/openaire/urls_worker/components/ScheduledTasks.java

@@ -39,13 +39,15 @@ public class ScheduledTasks {
     private String workerReportsDirPath;
 
     private static final File rootPath = new File("/");
-    private static final long oneAndHalfGB = 1_610_612_736L;    // 1.5 GB free space per 1.000-assignments-batch.
+    private static final long oneAndHalfGB = 1_610_612_736L;    // We need 1.5 GB free space per 1.000-assignments-batch.
     private static long requiredFreeSpace;
 
+    private static final int oneMb = (1024 * 1024);
+
 
     public ScheduledTasks(@Value("${info.maxAssignmentsLimitPerBatch}") int maxAssignmentsLimitPerBatch)
     {
-        if ( maxAssignmentsLimitPerBatch < 1_000 )
+        if ( maxAssignmentsLimitPerBatch <= 1_000 )
             requiredFreeSpace = oneAndHalfGB;
         else
             requiredFreeSpace = oneAndHalfGB * (maxAssignmentsLimitPerBatch / 1_000);
@@ -53,11 +55,13 @@ public class ScheduledTasks {
         logger.info("The \"requiredFreeSpace\" for the app to request new assignments, having \"maxAssignmentsLimitPerBatch\" equal to " + maxAssignmentsLimitPerBatch + " , is: " + (requiredFreeSpace / (1024 * 1024)) + " Mb");
     }
 
+
     @Scheduled(fixedDelay = 1)  // Request the next batch immediately after the last one finishes.
-    public void handleNewAssignments() {
+    public void handleNewAssignments()
+    {
         if ( GeneralController.shouldShutdownWorker || AssignmentsHandler.shouldNotRequestMore ) {
             // Here we will be right after the Worker has posted its last report. It is guaranteed that the Controller will not have processed it and have not requested the full-text files.
-            // We do not want to shut down the controller.
+            // We do not want to shut down the Worker, until all files have been transferred to the Controller, or some time has passed.
             return;
         }
 
@@ -65,11 +69,7 @@ public class ScheduledTasks {
             // It's not safe to proceed with downloading more files and risk of "noSpaceLeft" error.
             // Wait for the Controller to take the full-texts and any remaining files to be deleted, so that more free-space becomes available.
             // We need to have some buffer zone for the ".tar" files which will be created from the already downloaded full-texts, when the Controller starts requesting them.
-            if ( GeneralController.shouldShutdownWorker ) { // Make sure the worker shuts-down, in case the user sends the relevant request, while the worker is stuck in a free-space check loop.
-                AssignmentsHandler.shouldNotRequestMore = true;
-                return;
-            }
-            logger.warn("The free space is running out (less than " + (requiredFreeSpace / (1024 * 1024)) + " Mb). The Worker will avoid getting new assignments for the next 15 minutes.");
+            logger.warn("The free space is running out (less than " + (requiredFreeSpace / oneMb) + " Mb). The Worker will avoid getting new assignments for the next 15 minutes.");
             try {
                 Thread.sleep(900_000);  // Sleep for 15 mins to stall the scheduler from retrying right away, thus giving time to the disk-space to be freed.
             } catch (InterruptedException ie) {
@@ -79,10 +79,6 @@ public class ScheduledTasks {
         }
 
         if ( AssignmentsHandler.hadConnectionErrorOnRequest ) {
-            if ( GeneralController.shouldShutdownWorker ) { // Make sure the worker shuts-down, in case the user sends the relevant request, while the worker is stuck in a data-request error-loop.
-                AssignmentsHandler.shouldNotRequestMore = true;
-                return;
-            }
             try {
                 Thread.sleep(900_000);  // Sleep for 15 mins to stall the scheduler from retrying right away, thus giving time to the Controller to recover.
             } catch (InterruptedException ie) {
@@ -104,7 +100,7 @@ public class ScheduledTasks {
             return;
 
         // Check if the full-texts have been delivered to the Controller.
-        // In case some files have been left behind due to an error. DO not shutdown, but wait for the other scheduled task to clean the in the right time and then shutdown.
+        // In case some files have been left behind due to an error. DO not shut down, but wait for the other scheduled task to clean the in the right time and then shutdown.
 
         File fullTextsBaseDir = new File(fileStorageService.assignmentsBaseLocation);
         if ( fullTextsBaseDir.isDirectory() ) {
@@ -114,7 +110,7 @@ public class ScheduledTasks {
                 return; // It's NOT safe to shut down.
             }
             if ( fulltextSubDirs.length > 0 ) {
-                logger.warn("The base full-texts directory still has sub-directories with full-texts, wait for the Controller to take all the files, or wait some time to past before they are deleted. Then the Worker will shut down.");
+                logger.warn("The base full-texts directory still has " + fulltextSubDirs.length + " sub-directories with full-texts, wait for the Controller to take all the files, or wait some time to past before they are deleted. Then the Worker will shut down.");
                 // Some subDirs may be left behind due to some error when processing the WorkerReport. In that case,
                 return;
             } else
@@ -130,7 +126,9 @@ public class ScheduledTasks {
     private static final Pattern ASSIGNMENTS_COUNTER = Pattern.compile(".*assignments_([\\d]+).*");
 
 
-    private static final double hoursToWaitBeforeDeletion = 36.0;
+    private static final double hoursToWaitBeforeDeletion = 48.0;
+
+    private static final int hoursDivisor = (1000 * 60 * 60);    // In order to get the time-difference in hours. We divide with: /1000 to get seconds, /60 to get minutes and /60 to get hours.
 
     @Scheduled(initialDelay = 21_600_000, fixedDelay = 21_600_000)  // InitialDelay & FixedDelay = 36 hours.
     //@Scheduled(initialDelay = 120_000, fixedDelay = 120_000)  // Just for testing (every 2 mins).
@@ -149,7 +147,6 @@ public class ScheduledTasks {
         // Also, the ".tar.zstd" file of last batch will be deleted here, as well as the whole directory itself.
 
         logger.debug("Going to check if any leftover full-texts exist and delete them.");
-
         int usableDirsNum = 0;
         try {
             File fullTextsBaseDir = new File(fileStorageService.assignmentsBaseLocation);
@@ -157,13 +154,11 @@ public class ScheduledTasks {
                 logger.error("The \"fullTextsBaseDir\" (" + fileStorageService.assignmentsBaseLocation + ") does not exist!");    // This base dir should always exist during execution!
                 return;
             }
-
             File[] fulltextSubDirs = fullTextsBaseDir.listFiles(File::isDirectory);
             if ( fulltextSubDirs == null ) {
                 logger.error("There was an error when getting the subDirs of \"fullTextsBaseDir\": " + fullTextsBaseDir);
                 return;
             }
-
             usableDirsNum = fulltextSubDirs.length;
             if ( usableDirsNum == 0 ) {
                 logger.debug("The \"fullTextsBaseDir\" is empty, so there is nothing to delete.");
@@ -180,7 +175,7 @@ public class ScheduledTasks {
                     logger.trace("The subDir \"" + subDir.getName() + "\" was last accessed in: " + new Date(lastModified));
 
                 // Get the difference in hours. /1000 to get seconds, /60 to get minutes and /60 to get hours.
-                double elapsedHours = (double) (currentTime - lastModified) / (1000 * 60 * 60);
+                double elapsedHours = (double) (currentTime - lastModified) / hoursDivisor;
                 if ( elapsedHours > hoursToWaitBeforeDeletion ) {
                     // Enough time has passed, the directory should be deleted immediately.
                     String subDirName = subDir.getName();
@@ -193,9 +188,8 @@ public class ScheduledTasks {
                         String assingmentsCounterString = matcher.group(1);
                         if ( (assingmentsCounterString != null) && !assingmentsCounterString.isEmpty()) {
                             if ( FullTextsController.deleteFile(this.workerReportsDirPath + this.workerId + "_assignments_" + assingmentsCounterString + "_report.json") )
-                                logger.warn("The subDir \"" + subDirName + "\" probably contains some failed file, since the workerReport for assignments_" + assingmentsCounterString + " was deleted only now, which means the Controller failed to successfully process the results of those assignments.");
-                        }
-                        else
+                                logger.warn("The subDir \"" + subDirName + "\" probably contains some failed files, since the workerReport for assignments_" + assingmentsCounterString + " was deleted only now, which means the Controller failed to successfully process the results of those assignments.");
+                        } else
                             logger.error("The subDir \"" + subDirName + "\" has an invalid name! It does not contains the assignmentsCounter!");
                     } else
                         logger.error("The subDir \"" + subDirName + "\" has an invalid name! It could not be matched with regex: " + ASSIGNMENTS_COUNTER);

src/main/java/eu/openaire/urls_worker/components/plugins/PublicationsRetrieverPlugin.java

@@ -37,14 +37,11 @@ public class PublicationsRetrieverPlugin {
 
     public static String assignmentsBasePath;
 
-    private static String workerId;
-
     private static CookieStore cookieStore = null;
 
 
-    public PublicationsRetrieverPlugin(@Value("${info.workerId}")String workerId, @Value("${info.maxAssignmentsLimitPerBatch}") int maxAssignmentsLimitPerBatch, FileStorageService fileStorageService) {
+    public PublicationsRetrieverPlugin(@Value("${info.maxAssignmentsLimitPerBatch}") int maxAssignmentsLimitPerBatch, FileStorageService fileStorageService) {
         // Specify some configurations
-        this.workerId = workerId;
         LoaderAndChecker.retrieveDocuments = true;
         LoaderAndChecker.retrieveDatasets = false;
         ConnSupportUtils.setKnownMimeTypes();
@@ -83,16 +80,26 @@ public class PublicationsRetrieverPlugin {
 
         File curAssignmentsDirs = new File(FileUtils.storeDocFilesDir);
         try {
-            if ( ! curAssignmentsDirs.mkdirs() ) // Create the subdirectory. It may return "false", in case it already exists (will not happen, unless there is problem in cleaning up of the subdirectories) or any problem occurred.
-                throw new RuntimeException("Could not create the \"assignments_" + assignmentRequestCounter + "_fullTexts\" directories: \"" + FileUtils.storeDocFilesDir + "\"!");
+            if ( !curAssignmentsDirs.exists() ) {
+                if ( !curAssignmentsDirs.mkdirs() ) // Try to create the directory(-ies) if they don't exist. If they exist OR if sth went wrong, the result is the same: "false".
+                    throw new RuntimeException("Could not create the \"" + currentAssignmentsSubDir + "\" directories: \"" + FileUtils.storeDocFilesDir + "\"!");
+            } else
+                logger.warn("The curAssignmentsDirs: \"" + currentAssignmentsSubDir + "\" already exist! Probably left behind by a previous execution..");
         } catch (Exception e) { // Mainly a SecurityException.
             throw new RuntimeException("Failed to create the full-texts directory for assignments_" + assignmentRequestCounter + ": " + e.getMessage());
         }
 
+        final int[] urlsCounter = {0};
+        int numOfAssignments = assignments.size();
+
         // Start loading and checking urls.
         for ( Assignment assignment : assignments )
         {
             callableTasks.add(() -> {
+                urlsCounter[0]++;
+                if ( (urlsCounter[0] % 250) == 0 )  // Every 250 urls, display a "progress" message.
+                    logger.debug("Assignments_" + assignmentRequestCounter + " progress: will process url-" + urlsCounter[0] + " out of " + numOfAssignments);
+
                 String id = assignment.getId();
                 String url = assignment.getOriginalUrl();
 
@@ -103,11 +110,10 @@ public class PublicationsRetrieverPlugin {
                     return false;
                 }
 
-                if ( (url = LoaderAndChecker.handleUrlChecks(id, url)) == null ) {
+                if ( (url = LoaderAndChecker.handleUrlChecks(id, url)) == null )
                     return false;
-                }    // The "url" might have changed (inside "handleUrlChecks()").
 
-                String urlToCheck = url;
+                String urlToCheck = url;    // The "url" might have changed (inside "handleUrlChecks()").
                 String sourceUrl = urlToCheck;    // Hold it here for the logging-messages.
                 if ( (urlToCheck = LoaderAndChecker.basicURLNormalizer.filter(sourceUrl)) == null ) {
                     logger.warn("Could not normalize url: " + sourceUrl);
@@ -136,7 +142,8 @@ public class PublicationsRetrieverPlugin {
                     List<String> list = LoaderAndChecker.getWasValidAndCouldRetry(e, urlToCheck);
                     String wasUrlValid = list.get(0);
                     String couldRetry = list.get(1);
-                    UrlUtils.logOutputData(id, urlToCheck, null, UrlUtils.unreachableDocOrDatasetUrlIndicator, "Discarded at loading time, due to connectivity problems.", null, true, "true", wasUrlValid, "false", "false", couldRetry, null, null);
+                    String errorMsg = "Discarded at loading time, as " + list.get(2);
+                    UrlUtils.logOutputData(id, urlToCheck, null, UrlUtils.unreachableDocOrDatasetUrlIndicator, errorMsg, null, true, "true", wasUrlValid, "false", "false", couldRetry, null, null);
                     return false;
                 }
                 return true;
@@ -185,6 +192,7 @@ public class PublicationsRetrieverPlugin {
         for ( Assignment assignment : assignments )
             urlIdsWithDatasourceIds.put(assignment.getId(), assignment.getDatasource().getId());
 
+        int numOfUnretrievedFiles = 0;
         Timestamp timestamp = new Timestamp(System.currentTimeMillis()); // Store it here, in order to have the same for all current records.
 
         for ( DataToBeLogged data : FileUtils.dataToBeLoggedList )
@@ -247,11 +255,13 @@ public class PublicationsRetrieverPlugin {
                 else if ( ! comment.startsWith(HttpConnUtils.docFileNotRetrievedMessage, 0) ) {  // If it was downloaded without an error.
                     fileLocation = comment; // This is the full-file-path.
                     mimeType = "application/pdf";
-                } else  // Else the file was not retrieved, so all file-related data are kept "null".
+                } else {  // Else the file was not retrieved, so all file-related data are kept "null".
+                    numOfUnretrievedFiles ++;
                     error = new Error(Error.ErrorType.couldRetry, comment); // We can still try to download it from the found docUrl, in the future.
+                }
 
                 if ( error == null )    // If the file was retrieved, in any time.
-                    error = new Error(Error.ErrorType.couldRetry, null);  // We do not want to send a "null" Error-object, since it just adds more complicated handling in the controller..
+                    error = new Error(Error.ErrorType.couldRetry, null);  // We do not want to send a "null" Error-object, since it just adds more complicated handling in the Controller..
             }
             else {
                 status = UrlReport.StatusType.non_accessible;
@@ -281,6 +291,9 @@ public class PublicationsRetrieverPlugin {
             AssignmentsHandler.urlReports.add(new UrlReport(status, payload, error));
         }// end-for
         FileUtils.dataToBeLoggedList.clear();   // Empty the list, to be re-populated by the next batch / assignment.
+
+        if ( numOfUnretrievedFiles > 50 )
+            logger.warn("The number of non-retrieved files is: " + numOfUnretrievedFiles);
     }
 
 }

src/main/java/eu/openaire/urls_worker/controllers/FullTextsController.java

@@ -38,7 +38,7 @@ public class FullTextsController {
     public Object getFullTexts(@PathVariable long assignmentsCounter, @PathVariable int totalBatches, @PathVariable int batchCounter, @PathVariable List<String> fileNamesWithExtensions)
     {
         int fileNamesListNum = fileNamesWithExtensions.size();
-        if ( (fileNamesListNum == 1) && (fileNamesWithExtensions.get(0).length() == 0) ) {  // In case the last "/" in the url was given (without any files following), then this list will not be empty, but have one empty item instead.
+        if ( (fileNamesListNum == 1) && (fileNamesWithExtensions.get(0).isEmpty()) ) {  // In case the last "/" in the url was given (without any files following), then this list will not be empty, but have one empty item instead.
             // In case the url does not end in "/", then Spring will automatically return an "HTTP-BadRequest".
             String errorMsg = "An empty \"fileNamesWithExtensions\" list was given from assignments_" + assignmentsCounter + ", for batch_" + batchCounter;
             logger.error(errorMsg);
@@ -91,8 +91,9 @@ public class FullTextsController {
         } finally {
             // The ".tar.zstd" file of this batch, for which we pass a steam to the Controller, will be deleted by the next batch or in the end of these assignments.
             // Now we will delete the zstd file of the previous assignments.
-            if ( batchCounter >= 2 )
-                deleteFile(currentAssignmentsBaseFullTextsPath + "assignments_" + assignmentsCounter + "_full-texts_" + (batchCounter -1) + ".tar.zstd");
+            int previousBatchCounter = (batchCounter -1);
+            if ( previousBatchCounter >= 1 )
+                deleteFile(currentAssignmentsBaseFullTextsPath + "assignments_" + assignmentsCounter + "_full-texts_" + previousBatchCounter + ".tar.zstd");
         }
     }
 
@@ -129,7 +130,7 @@ public class FullTextsController {
                 directoryPath += "assignments_" + curAssignments + "_fullTexts";
                 logger.debug("Going to delete the files inside the directory of assignments_" + curAssignments);
             } else
-                logger.debug("Going to delete the parent directory: " + directoryPath);
+                logger.debug("Going to delete the parent assignments directory: " + directoryPath);
             dir = new File(directoryPath);
         }
         return deleteDirectory(dir);

src/main/java/eu/openaire/urls_worker/controllers/GeneralController.java

@@ -5,6 +5,7 @@ import eu.openaire.urls_worker.components.plugins.PublicationsRetrieverPlugin;
 import eu.openaire.urls_worker.util.UriBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -22,6 +23,9 @@ public class GeneralController {
 
     private static final Logger logger = LoggerFactory.getLogger(GeneralController.class);
 
+    @Autowired
+    AssignmentsHandler assignmentsHandler;
+
     private final String controllerIp;
     private final String workerReportsDirPath;
     private final String workerId;
@@ -66,9 +70,11 @@ public class GeneralController {
 
         String finalMsg = "";
         if ( shouldShutdownWorker )
-            finalMsg = "The worker has already received a \"shutdownWorker\" (which was not canceled afterwards).";
-        else
+            finalMsg = "The worker has already received a \"shutdownWorker\" request (which was not canceled afterwards). ";
+        else {
             shouldShutdownWorker = true;
+            AssignmentsHandler.shouldNotRequestMore = true;
+        }
 
         finalMsg += "The worker will shutdown, after finishing current work.";
         logger.info(initMsg + finalMsg);
@@ -85,6 +91,9 @@ public class GeneralController {
             return responseEntity;
 
         shouldShutdownWorker = false;
+        if ( AssignmentsHandler.numHandledAssignmentsBatches < assignmentsHandler.maxAssignmentsBatchesToHandleBeforeShutdown )
+            AssignmentsHandler.shouldNotRequestMore = false;    // Make sure the worker shuts-down, in case the user sends the relevant request, while the worker is stuck in a data-request error-loop.
+
         String finalMsg = "Any previous \"shutdownWorker\"-request is canceled. The \"maxAssignmentsBatchesToHandleBeforeShutdown\" will still be honored (if it's set).";
         logger.info(initMsg + finalMsg);
         return ResponseEntity.ok().body(finalMsg + "\n");
@@ -94,23 +103,28 @@ public class GeneralController {
     @GetMapping("getHandledAssignmentsCounts")
     public ResponseEntity<?> getHandledAssignmentsCounts()
     {
-        return ResponseEntity.ok(AssignmentsHandler.assignmentsNumsHandled);
+        return ResponseEntity.ok(AssignmentsHandler.handledAssignmentsCounters);
     }
 
 
     @PostMapping("addReportResultToWorker/{assignmentsCounter}")
     public ResponseEntity<?> addReportResultToWorker(@PathVariable long assignmentsCounter, @RequestBody(required=false) String errorMsg)
     {
-        String directoryPath = PublicationsRetrieverPlugin.assignmentsBasePath + "assignments_" + assignmentsCounter + "_fullTexts";
-        File dir = new File(directoryPath);
-        if ( ! dir.isDirectory() ) {
-            logger.error("The \"addReportResultToWorker\"-endpoint was called for an unknown \"assignmentsCounter\": " + assignmentsCounter);
-            return ResponseEntity.notFound().build();
+        if ( ! AssignmentsHandler.handledAssignmentsCounters.contains(assignmentsCounter) ) {
+            errorMsg = "The \"addReportResultToWorker\"-endpoint was called for an unknown \"assignmentsCounter\": " + assignmentsCounter;
+            logger.error(errorMsg);
+            return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorMsg);
         }
 
         if ( errorMsg == null ) {
             logger.info("The Controller successfully handled the WorkerReport, for assignments_" + assignmentsCounter + ". The worker-report and all full-text files associated with it, will be deleted.");
-            FullTextsController.deleteAssignmentsDirectory(assignmentsCounter, dir);
+            String directoryPath = PublicationsRetrieverPlugin.assignmentsBasePath + "assignments_" + assignmentsCounter + "_fullTexts";
+            File dir = new File(directoryPath);
+            if ( dir.isDirectory() )
+                FullTextsController.deleteAssignmentsDirectory(assignmentsCounter, dir);
+            else
+                logger.warn("The full-texts directory \"" + directoryPath + "\" has already been deleted by the scheduler.");
+
             FullTextsController.deleteFile(this.workerReportsDirPath + this.workerId + "_assignments_" + assignmentsCounter + "_report.json");
         } else
             logger.error("The Controller failed to handle the WorkerReport, for assignments_" + assignmentsCounter + ". The error is:\n" + errorMsg);

src/main/java/eu/openaire/urls_worker/payloads/responces/WorkerReport.java

@@ -59,7 +59,7 @@ public class WorkerReport {
     }
 
     public String getJsonReport() {
-        return gson.toJson(this);
+        return gson.toJson(this, WorkerReport.class);
     }
 
 

src/main/java/eu/openaire/urls_worker/util/FilesCompressor.java

@@ -12,6 +12,7 @@ import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
@@ -85,7 +86,9 @@ public class FilesCompressor {
             }
         }
 
-        if ( numTarredFiles != filesToTar.size() )
+        if ( numTarredFiles == 0 ) {
+            throw new RuntimeException("None of the requested (" + filesToTar.size() + ") could be tarred, for assignments_" + assignmentsCounter + ", batch_" + tarBatchCounter);
+        } else if ( numTarredFiles != filesToTar.size() )
             logger.warn("The number of \"numTarredFiles\" (" + numTarredFiles + ") is different from the number of files requested to be tarred (" + filesToTar.size() + "), for assignments_" + assignmentsCounter + ", batch_" + tarBatchCounter);
             // Still, some files may have been tarred, so we move on. It's up to the Controller, to handle such case.
 
@@ -98,8 +101,7 @@ public class FilesCompressor {
         boolean shouldCloseEntry = false;   // Useful in order to know if we should close the entry (an Exception may appear when initializing the stream, and so we should not try to close it).
 
         Path fullFileNamePath = Paths.get(baseDir + fileName);
-        try ( BufferedInputStream fis = new BufferedInputStream(Files.newInputStream(fullFileNamePath), bufferSize) )
-        {
+        try ( BufferedInputStream fis = new BufferedInputStream(Files.newInputStream(fullFileNamePath), bufferSize) ) {
             TarArchiveEntry entry = new TarArchiveEntry(fileName);
             entry.setSize(Files.size(fullFileNamePath));    // Yes, tar requires that we set the size beforehand..
             taos.putArchiveEntry(entry);
@@ -109,6 +111,9 @@ public class FilesCompressor {
             while ( (readByte = fis.read()) != -1 ) {
                 taos.write(readByte);
             }
+        } catch (NoSuchFileException nsfe) {
+            logger.error("NoSuchFileException: " + nsfe.getMessage());
+            return false;
         } catch (Exception e) {
             logger.error("", e);
             return false;

src/main/resources/application.properties

@@ -11,7 +11,7 @@
 
 # HTTP CONFIGURATION
 server.port = 1881
-# Set the above value to < 0 >, in order to choose a random port (it will automatically choose a new random port, if the previously chosen is already in use)..
+# You can set the above value to < 0 >, in order to choose a random port (it will automatically choose a new random port, if the previously chosen is already in use)..
 
 # Server api path
 server.servlet.context-path=/api
@@ -34,6 +34,7 @@ workerReportsDirPath: ${HOME}/workerReports/
 
 # LOGGING LEVELS
 logging.config=classpath:logback-spring.xml
+logging.file.path=logs
 logging.level.root=INFO
 logging.level.org.springframework.web=INFO
 logging.level.org.springframework.security=WARN

src/main/resources/logback-spring.xml

@@ -2,16 +2,16 @@
 <configuration debug="false">
 
     <appender name="RollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>logs/UrlsWorker.log</file>
+        <file>${LOG_PATH}/UrlsWorker.log</file>
 
         <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>logs/UrlsWorker.%i.log.zip</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/UrlsWorker.%i.log.zip</fileNamePattern>
             <minIndex>1</minIndex>
-            <maxIndex>20</maxIndex>
+            <maxIndex>10</maxIndex>
         </rollingPolicy>
 
         <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>50MB</maxFileSize>
+            <maxFileSize>100MB</maxFileSize>
         </triggeringPolicy>
         <encoder>
             <charset>UTF-8</charset>
@@ -27,6 +27,7 @@
     </appender>
 
     <root level="debug">
+        <!-- <appender-ref ref="Console" /> -->
         <appender-ref ref="RollingFile" />
     </root>
 

src/test/java/eu/openaire/urls_worker/UrlsWorkerApplicationTests.java

@@ -1,6 +1,6 @@
 package eu.openaire.urls_worker;
 
-import org.junit.jupiter.api.Test;
+//import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest