Merge pull request #441 from Netflix/revert-374-dev_optimize_upstream

Revert "Minimal adjust, Don't to index an empty task exec log and more things"
Netflix · Mar 1, 2018 · c38a666 · c38a666
2 parents 84db22c + 3e2c0ae
commit c38a666
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/es5-persistence/src/main/java/com/netflix/conductor/dao/es5/index/ElasticSearchDAO.java b/es5-persistence/src/main/java/com/netflix/conductor/dao/es5/index/ElasticSearchDAO.java
@@ -241,8 +241,6 @@ public void index(Task task) {
 
 	@Override
 	public void add(List<TaskExecLog> logs) {
-		if (logs.size() == 0)return;
-
 		int retry = 3;
 		while(retry > 0) {
 			try {

diff --git a/jersey/src/main/java/com/netflix/conductor/server/resources/MetadataResource.java b/jersey/src/main/java/com/netflix/conductor/server/resources/MetadataResource.java
@@ -65,19 +65,12 @@ public void create(WorkflowDef def) throws Exception{
 	}
 
 	@PUT
-	@Path("/workflows")
-	@ApiOperation("Create or update multi  workflow definition")
+	@Path("/workflow")
+	@ApiOperation("Create or update workflow definition")
 	public void update(List<WorkflowDef> defs) throws Exception{
 		service.updateWorkflowDef(defs);
 	}
 
-	@PUT
-	@Path("/workflow")
-	@ApiOperation("Create or update a workflow definition")
-	public void update(WorkflowDef def) throws Exception{
-		service.updateWorkflowDef(def);
-	}
-
 	@GET
 	@ApiOperation("Retrieves workflow definition along with blueprint")
 	@Path("/workflow/{name}")

diff --git a/mysql-persistence/src/main/java/com/netflix/conductor/dao/mysql/MySQLExecutionDAO.java b/mysql-persistence/src/main/java/com/netflix/conductor/dao/mysql/MySQLExecutionDAO.java
@@ -174,7 +174,7 @@ public void removeTask(String taskId) {
 			return;
 		}
 
-		String taskKey = task.getReferenceTaskName() + "_" + task.getRetryCount();
+		String taskKey = task.getReferenceTaskName() + "" + task.getRetryCount();
 
 		withTransaction(connection -> {
 			removeScheduledTask(connection, task, taskKey);