Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Commit

Permalink
remove guava from common module;handle exceptions in sweeper
Browse files Browse the repository at this point in the history
  • Loading branch information
@apanicker-nflx
apanicker-nflx committed Apr 15, 2022
1 parent d045c14 commit afde1d1
Show file tree
Hide file tree
Showing 53 changed files with 613 additions and 1,418 deletions.
16 changes: 0 additions & 16 deletions azureblob-storage/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,16 +439,9 @@
"com.fasterxml.jackson.dataformat:jackson-dataformat-xml"
]
},
"com.github.rholder:guava-retrying": {
"locked": "2.0.0",
"transitive": [
"com.netflix.conductor:conductor-common"
]
},
"com.google.code.findbugs:jsr305": {
"locked": "3.0.2",
"transitive": [
"com.github.rholder:guava-retrying",
"com.google.guava:guava"
]
},
Expand All @@ -467,7 +460,6 @@
"com.google.guava:guava": {
"locked": "30.0-jre",
"transitive": [
"com.github.rholder:guava-retrying",
"com.netflix.conductor:conductor-core"
]
},
Expand Down Expand Up @@ -1424,16 +1416,9 @@
"com.fasterxml.jackson.dataformat:jackson-dataformat-xml"
]
},
"com.github.rholder:guava-retrying": {
"locked": "2.0.0",
"transitive": [
"com.netflix.conductor:conductor-common"
]
},
"com.google.code.findbugs:jsr305": {
"locked": "3.0.2",
"transitive": [
"com.github.rholder:guava-retrying",
"com.google.guava:guava"
]
},
Expand All @@ -1452,7 +1437,6 @@
"com.google.guava:guava": {
"locked": "30.0-jre",
"transitive": [
"com.github.rholder:guava-retrying",
"com.netflix.conductor:conductor-core"
]
},
Expand Down
1 change: 1 addition & 0 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ allprojects {
testLogging {
events = ["SKIPPED", "FAILED"]
exceptionFormat = "full"
displayGranularity = 1
showStandardStreams = false
}
}
Expand Down
16 changes: 0 additions & 16 deletions cassandra-persistence/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,16 +330,9 @@
"com.github.jnr:jnr-ffi"
]
},
"com.github.rholder:guava-retrying": {
"locked": "2.0.0",
"transitive": [
"com.netflix.conductor:conductor-common"
]
},
"com.google.code.findbugs:jsr305": {
"locked": "3.0.2",
"transitive": [
"com.github.rholder:guava-retrying",
"com.google.guava:guava"
]
},
Expand All @@ -359,7 +352,6 @@
"locked": "30.0-jre",
"transitive": [
"com.datastax.cassandra:cassandra-driver-core",
"com.github.rholder:guava-retrying",
"com.netflix.conductor:conductor-core"
]
},
Expand Down Expand Up @@ -1496,16 +1488,9 @@
"com.github.jnr:jnr-ffi"
]
},
"com.github.rholder:guava-retrying": {
"locked": "2.0.0",
"transitive": [
"com.netflix.conductor:conductor-common"
]
},
"com.google.code.findbugs:jsr305": {
"locked": "3.0.2",
"transitive": [
"com.github.rholder:guava-retrying",
"com.google.guava:guava"
]
},
Expand All @@ -1525,7 +1510,6 @@
"locked": "30.0-jre",
"transitive": [
"com.datastax.cassandra:cassandra-driver-core",
"com.github.rholder:guava-retrying",
"com.netflix.conductor:conductor-core"
]
},
Expand Down
58 changes: 11 additions & 47 deletions ...-persistence/src/main/java/com/netflix/conductor/cassandra/dao/CassandraExecutionDAO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@
*/
package com.netflix.conductor.cassandra.dao;

import java.util.ArrayList;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import java.util.*;
import java.util.stream.Collectors;

import org.slf4j.Logger;
Expand All @@ -28,7 +23,6 @@
import com.netflix.conductor.cassandra.util.Statements;
import com.netflix.conductor.common.metadata.events.EventExecution;
import com.netflix.conductor.common.metadata.tasks.TaskDef;
import com.netflix.conductor.common.utils.RetryUtil;
import com.netflix.conductor.core.exception.ApplicationException;
import com.netflix.conductor.core.exception.ApplicationException.Code;
import com.netflix.conductor.dao.ConcurrentExecutionLimitDAO;
Expand All @@ -37,25 +31,12 @@
import com.netflix.conductor.model.TaskModel;
import com.netflix.conductor.model.WorkflowModel;

import com.datastax.driver.core.BatchStatement;
import com.datastax.driver.core.PreparedStatement;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.Row;
import com.datastax.driver.core.Session;
import com.datastax.driver.core.*;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;

import static com.netflix.conductor.cassandra.util.Constants.DEFAULT_SHARD_ID;
import static com.netflix.conductor.cassandra.util.Constants.DEFAULT_TOTAL_PARTITIONS;
import static com.netflix.conductor.cassandra.util.Constants.ENTITY_KEY;
import static com.netflix.conductor.cassandra.util.Constants.ENTITY_TYPE_TASK;
import static com.netflix.conductor.cassandra.util.Constants.ENTITY_TYPE_WORKFLOW;
import static com.netflix.conductor.cassandra.util.Constants.PAYLOAD_KEY;
import static com.netflix.conductor.cassandra.util.Constants.TASK_ID_KEY;
import static com.netflix.conductor.cassandra.util.Constants.TOTAL_PARTITIONS_KEY;
import static com.netflix.conductor.cassandra.util.Constants.TOTAL_TASKS_KEY;
import static com.netflix.conductor.cassandra.util.Constants.WORKFLOW_ID_KEY;
import static com.netflix.conductor.cassandra.util.Constants.*;

@Trace
public class CassandraExecutionDAO extends CassandraBaseDAO
Expand Down Expand Up @@ -746,19 +727,11 @@ public void addTaskToLimit(TaskModel task) {
try {
recordCassandraDaoRequests(
"addTaskToLimit", task.getTaskType(), task.getWorkflowType());
new RetryUtil<>()
.retryOnException(
() ->
session.execute(
updateTaskDefLimitStatement.bind(
UUID.fromString(task.getWorkflowInstanceId()),
task.getTaskDefName(),
UUID.fromString(task.getTaskId()))),
null,
null,
3,
"Adding to task_def_limit",
"addTaskToLimit");
session.execute(
updateTaskDefLimitStatement.bind(
UUID.fromString(task.getWorkflowInstanceId()),
task.getTaskDefName(),
UUID.fromString(task.getTaskId())));
} catch (Exception e) {
Monitors.error(CLASS_NAME, "addTaskToLimit");
String errorMsg =
Expand All @@ -775,18 +748,9 @@ public void removeTaskFromLimit(TaskModel task) {
try {
recordCassandraDaoRequests(
"removeTaskFromLimit", task.getTaskType(), task.getWorkflowType());
new RetryUtil<>()
.retryOnException(
() ->
session.execute(
deleteTaskDefLimitStatement.bind(
task.getTaskDefName(),
UUID.fromString(task.getTaskId()))),
null,
null,
3,
"Deleting from task_def_limit",
"removeTaskFromLimit");
session.execute(
deleteTaskDefLimitStatement.bind(
task.getTaskDefName(), UUID.fromString(task.getTaskId())));
} catch (Exception e) {
Monitors.error(CLASS_NAME, "removeTaskFromLimit");
String errorMsg =
Expand Down
84 changes: 2 additions & 82 deletions client-spring/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,12 +385,6 @@
"com.github.vlsi.compactmap:compactmap"
]
},
"com.github.rholder:guava-retrying": {
"locked": "2.0.0",
"transitive": [
"com.netflix.conductor:conductor-common"
]
},
"com.github.vlsi.compactmap:compactmap": {
"locked": "2.0",
"transitive": [
Expand All @@ -400,8 +394,6 @@
"com.google.code.findbugs:jsr305": {
"locked": "3.0.2",
"transitive": [
"com.github.rholder:guava-retrying",
"com.google.guava:guava",
"com.netflix.archaius:archaius-core",
"com.netflix.eureka:eureka-client",
"com.netflix.netflix-commons:netflix-infix"
Expand All @@ -413,47 +405,21 @@
"com.netflix.netflix-commons:netflix-infix"
]
},
"com.google.errorprone:error_prone_annotations": {
"locked": "2.3.4",
"transitive": [
"com.google.guava:guava"
]
},
"com.google.guava:failureaccess": {
"locked": "1.0.1",
"transitive": [
"com.google.guava:guava"
]
},
"com.google.guava:guava": {
"locked": "30.0-jre",
"locked": "19.0",
"transitive": [
"com.github.rholder:guava-retrying",
"com.google.inject:guice",
"com.netflix.archaius:archaius-core",
"com.netflix.conductor:conductor-client",
"com.netflix.netflix-commons:netflix-infix",
"com.netflix.servo:servo-core"
]
},
"com.google.guava:listenablefuture": {
"locked": "9999.0-empty-to-avoid-conflict-with-guava",
"transitive": [
"com.google.guava:guava"
]
},
"com.google.inject:guice": {
"locked": "4.1.0",
"transitive": [
"com.netflix.eureka:eureka-client"
]
},
"com.google.j2objc:j2objc-annotations": {
"locked": "1.3",
"transitive": [
"com.google.guava:guava"
]
},
"com.google.protobuf:protobuf-java": {
"locked": "3.13.0",
"transitive": [
Expand Down Expand Up @@ -715,12 +681,6 @@
"com.netflix.conductor:conductor-common"
]
},
"org.checkerframework:checker-qual": {
"locked": "3.5.0",
"transitive": [
"com.google.guava:guava"
]
},
"org.codehaus.jettison:jettison": {
"locked": "1.4.0",
"transitive": [
Expand Down Expand Up @@ -1427,12 +1387,6 @@
"com.github.vlsi.compactmap:compactmap"
]
},
"com.github.rholder:guava-retrying": {
"locked": "2.0.0",
"transitive": [
"com.netflix.conductor:conductor-common"
]
},
"com.github.vlsi.compactmap:compactmap": {
"locked": "2.0",
"transitive": [
Expand All @@ -1442,8 +1396,6 @@
"com.google.code.findbugs:jsr305": {
"locked": "3.0.2",
"transitive": [
"com.github.rholder:guava-retrying",
"com.google.guava:guava",
"com.netflix.archaius:archaius-core",
"com.netflix.eureka:eureka-client",
"com.netflix.netflix-commons:netflix-infix"
Expand All @@ -1455,47 +1407,21 @@
"com.netflix.netflix-commons:netflix-infix"
]
},
"com.google.errorprone:error_prone_annotations": {
"locked": "2.3.4",
"transitive": [
"com.google.guava:guava"
]
},
"com.google.guava:failureaccess": {
"locked": "1.0.1",
"transitive": [
"com.google.guava:guava"
]
},
"com.google.guava:guava": {
"locked": "30.0-jre",
"locked": "19.0",
"transitive": [
"com.github.rholder:guava-retrying",
"com.google.inject:guice",
"com.netflix.archaius:archaius-core",
"com.netflix.conductor:conductor-client",
"com.netflix.netflix-commons:netflix-infix",
"com.netflix.servo:servo-core"
]
},
"com.google.guava:listenablefuture": {
"locked": "9999.0-empty-to-avoid-conflict-with-guava",
"transitive": [
"com.google.guava:guava"
]
},
"com.google.inject:guice": {
"locked": "4.1.0",
"transitive": [
"com.netflix.eureka:eureka-client"
]
},
"com.google.j2objc:j2objc-annotations": {
"locked": "1.3",
"transitive": [
"com.google.guava:guava"
]
},
"com.google.protobuf:protobuf-java": {
"locked": "3.13.0",
"transitive": [
Expand Down Expand Up @@ -1820,12 +1746,6 @@
"org.springframework.boot:spring-boot-starter-test"
]
},
"org.checkerframework:checker-qual": {
"locked": "3.5.0",
"transitive": [
"com.google.guava:guava"
]
},
"org.codehaus.jettison:jettison": {
"locked": "1.4.0",
"transitive": [
Expand Down
2 changes: 0 additions & 2 deletions client/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ configurations.all {

dependencies {
implementation project(':conductor-common')
// SBMTODO: remove guava dep
implementation "com.google.guava:guava:${revGuava}"

implementation "com.sun.jersey:jersey-client:${revJersey}"

Expand Down
Loading

0 comments on commit afde1d1

Please sign in to comment.