Skip to content

Commit

Permalink
Review distributed instances
Browse files Browse the repository at this point in the history
  • Loading branch information
hmiguim committed Jul 3, 2024
1 parent 78b2b7b commit a167f9d
Show file tree
Hide file tree
Showing 76 changed files with 795 additions and 607 deletions.
1 change: 0 additions & 1 deletion deploys/distributed/.gitignore

This file was deleted.

5 changes: 3 additions & 2 deletions deploys/distributed/central/docker-compose-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
zoo:
image: docker.io/zookeeper:3.9.2
image: docker.io/zookeeper:3.9-jre-17
restart: unless-stopped
ports:
- "2182:2181"
Expand Down Expand Up @@ -57,10 +57,11 @@ services:
- LDAP_ADMIN_PASSWORD=roda
- LDAP_EXTRA_SCHEMAS=cosine,inetorgperson,nis,pbkdf2
volumes:
- ./ldap/ldif/pbkdf2.ldif:/opt/bitnami/openldap/etc/schema/pbkdf2.ldif
- ldap_data:/opt/bitnami/openldap/etc/schema/pbkdf2.ldif
volumes:
zookeeper_data:
zookeeper_datalog:
solr_data:
clam_data:
siegfried_data:
ldap_data:
6 changes: 4 additions & 2 deletions deploys/distributed/local/docker-compose-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
zoo:
image: docker.io/zookeeper:3.9.2
image: docker.io/zookeeper:3.9-jre-17
restart: unless-stopped
ports:
- "2181:2181"
Expand All @@ -17,6 +17,7 @@ services:
environment:
ZK_HOST: zoo:2181
SOLR_HOST: localhost
SOLR_OPTS: "-Dsolr.environment=dev,label=DEV+ENV"
depends_on:
- zoo
command:
Expand Down Expand Up @@ -56,10 +57,11 @@ services:
- LDAP_ADMIN_PASSWORD=roda
- LDAP_EXTRA_SCHEMAS=cosine,inetorgperson,nis,pbkdf2
volumes:
- ./ldap/ldif/pbkdf2.ldif:/opt/bitnami/openldap/etc/schema/pbkdf2.ldif
- ldap_data:/opt/bitnami/openldap/etc/schema/pbkdf2.ldif
volumes:
zookeeper_data:
zookeeper_datalog:
solr_data:
clam_data:
siegfried_data:
ldap_data:
2 changes: 1 addition & 1 deletion deploys/standalone/docker-compose-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
- zookeeper_data:/data
- zookeeper_datalog:/datalog
solr:
image: docker.io/solr:9
image: docker.io/solr:9.6.1
restart: unless-stopped
ports:
- "8983:8983"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,10 @@ public String toString() {
public static final String CONTROLLER_DISPOSAL_CONFIRMATION_ID_PARAM = "disposalConfirmationId";

public static final String CONTROLLER_DISTRIBUTED_INSTANCE_PARAM = RODA_OBJECT_DISTRIBUTED_INSTANCE;
public static final String CONTROLLER_DISTRIBUTED_INSTANCE_ID_PARAM = "distributedInstanceId";
public static final String CONTROLLER_DISTRIBUTED_INSTANCE_STATUS_PARAM = "activate";
public static final String CONTROLLER_LOCAL_INSTANCE_PARAM = RODA_OBJECT_LOCAL_INSTANCE;
public static final String CONTROLLER_LOCAL_INSTANCE_ID_PARAM = "localInstanceId";
public static final String CONTROLLER_ACCESS_KEY_PARAM = RODA_OBJECT_ACCESS_KEY;

public static final String CONTROLLER_ID_OBJECT_PARAM = "transferred_resource_uuid, transferred_resource_path, sip, transferred_resource_original_name";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

public class AcquireLockTimeoutException extends LockingException {
@Serial
private static final long serialVersionUID = -3183093939393405726L;

public AcquireLockTimeoutException() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

/**
* @author Luis Faria <[email protected]>
*
*/
public class AlreadyExistsException extends RODAException {

@Serial
private static final long serialVersionUID = -6744205569453461540L;

public AlreadyExistsException() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

/**
* @author Tiago Fraga <[email protected]>
*/

public class AlreadyHasInstanceIdentifier extends RODAException {

@Serial
private static final long serialVersionUID = -6744205569453461540L;

public AlreadyHasInstanceIdentifier() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

/**
* @author Tiago Fraga <[email protected]>
*/
public class DisposalHoldAlreadyExistsException extends AlreadyExistsException {

@Serial
private static final long serialVersionUID = -9204333449702855127L;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

/**
* @author Tiago Fraga <[email protected]>
*/
public class DisposalHoldNotValidException extends GenericException {

@Serial
private static final long serialVersionUID = 2413699496731974126L;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

/**
* @author Tiago Fraga <[email protected]>
*/
public class DisposalRuleAlreadyExistsException extends AlreadyExistsException {
@Serial
private static final long serialVersionUID = -4589782633937474385L;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

/**
* @author Tiago Fraga <[email protected]>
*/
public class DisposalRuleNotValidException extends GenericException {

@Serial
private static final long serialVersionUID = 2413699496731974126L;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

/**
* @author Tiago Fraga <[email protected]>
*/
public class DisposalScheduleAlreadyExistsException extends AlreadyExistsException {

@Serial
private static final long serialVersionUID = -4589782633937474385L;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

/**
* @author Tiago Fraga <[email protected]>
*/
public class DisposalScheduleNotValidException extends GenericException {
@Serial
private static final long serialVersionUID = 809098516488134186L;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

/**
* Thrown to indicate that the specified email was is already used.
*
* @author Rui Castro
*/
public class EmailAlreadyExistsException extends AlreadyExistsException {
@Serial
private static final long serialVersionUID = 3392813159441368655L;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

/**
* Thrown to indicate that was not possible to authenticate {@link User} because
* it's email address is not verified.
*
* @author Rui Castro <[email protected]>
*/
public class EmailUnverifiedException extends AuthenticationDeniedException {
@Serial
private static final long serialVersionUID = 4619089972230221210L;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

import org.roda.core.data.v2.user.Group;

import java.io.Serial;

/**
* Thrown to indicate that a {@link Group} with the same name already exists
* when a new one is trying to be created.
Expand All @@ -17,6 +19,7 @@
*/
public class GroupAlreadyExistsException extends AlreadyExistsException {

@Serial
private static final long serialVersionUID = 6493339963861919270L;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

/**
* Thrown to indicate that the execution of some operation is not permited.
*
* @author Rui Castro
*/
public class IllegalOperationException extends RODAServiceException {
@Serial
private static final long serialVersionUID = -8118340939329992654L;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@

import org.roda.core.data.v2.user.User;

import java.io.Serial;

/**
* Thrown to indicate that was not possible to authenticate {@link User} because
* it is not active.
*
* @author Rui Castro <[email protected]>
*/
public class InactiveUserException extends AuthenticationDeniedException {
@Serial
private static final long serialVersionUID = -1893919532523481577L;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

/**
* @author Luis Faria <[email protected]>
*
*/
public class InstanceIdNotUpdated extends RODAException {
@Serial
private static final long serialVersionUID = -1656013708463576500L;

public InstanceIdNotUpdated() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,15 @@

import org.roda.core.data.v2.jobs.PluginParameter;

import java.io.Serial;

/**
* Thrown to indicate that a {@link PluginParameter} is wrong.
*
* @author Rui Castro
*/
public class InvalidParameterException extends RODAException {
@Serial
private static final long serialVersionUID = 4040123614898012034L;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,17 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

/**
* Thrown to indicate the the email confirmation token or password change token
* Thrown to indicate the email confirmation token or password change token
* is invalid. A token can be invalid because is not the expected token or
* because it already expired.
*
* @author Rui Castro
*/
public class InvalidTokenException extends RODAException {
@Serial
private static final long serialVersionUID = -182450030953675819L;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

public class IsStillUpdatingException extends RODAException {

@Serial
private static final long serialVersionUID = 7420264596411093449L;

public IsStillUpdatingException() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

/**
* @author Hélder Silva <[email protected]>
*
*/
public class JobAlreadyStartedException extends JobException {

@Serial
private static final long serialVersionUID = -6744205569453461540L;

public JobAlreadyStartedException() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

public class JobException extends RODAException {
@Serial
private static final long serialVersionUID = 1893131595923947285L;

public JobException() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,14 @@
*/
package org.roda.core.data.exceptions;

import java.io.Serial;

/**
* @author Hélder Silva <[email protected]>
*
*/
public class JobInErrorException extends JobException {
@Serial
private static final long serialVersionUID = 668519344542236907L;

public JobInErrorException() {
Expand Down
Loading

0 comments on commit a167f9d

Please sign in to comment.