Skip to content
This repository has been archived by the owner on Jul 7, 2020. It is now read-only.

Alias #267

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

Alias #267

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0295f7e
temp do not push
Aug 2, 2017
17230d9
init not push
Aug 10, 2017
11aedfa
do not push
Aug 10, 2017
fa367eb
initCommit-only query master reads alias cacheref T68833
Aug 10, 2017
87085e0
aliasCache2 init work
Aug 14, 2017
e23d236
alias cache init commit
Aug 14, 2017
7ac2e22
clean code
Aug 14, 2017
11ca37a
clean code
Aug 14, 2017
c7c3ddf
add cleaup in tests
Aug 14, 2017
cd152a9
added missing test
Aug 14, 2017
e9c40f6
remove unrelated file
Aug 14, 2017
e838491
clean up
Aug 14, 2017
d1be28d
clean up
Aug 14, 2017
8bf4250
modified code
Aug 15, 2017
fd25ffb
add licence to new files
Aug 15, 2017
a1931a9
removed unused variable
Aug 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
aliasCache2 init work
  • Loading branch information
Irene Cho committed Aug 14, 2017
commit 87085e06fde7ef901a4ffbc9b34b9618c9293206
11 changes: 1 addition & 10 deletions hydra-main/src/main/java/com/addthis/hydra/job/alias/AliasManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,16 +216,7 @@ public void deleteAlias(String alias) {
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't you copy the maps first? What happens if the deleteChild call below fails? You now have a bad state.

spawnDataStore.deleteChild(ALIAS_PATH, alias);

try {
ac.deleteAlias(alias);
List<String> jobs = ac.getJobs(alias);
if(jobs == null || jobs.size() == 0 ) {
log.error("There is no jobs for alias {}", alias);
return;
}
} catch (ExecutionException e) {
log.error("",e);
}
ac.deleteAlias(alias);
}

/**
Expand Down
45 changes: 22 additions & 23 deletions hydra-main/src/test/java/com/addthis/hydra/query/spawndatastore/AliasCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@

import org.junit.Test;

import static junit.framework.TestCase.assertNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;

public class AliasCacheTest {
@Test
Expand Down Expand Up @@ -55,26 +54,26 @@ public void testGetJob_Remove() throws Exception {
Thread.sleep(3000);
assertNull(ac.getJobs("a1"));
}

@Test
public void testGetJob_Loop() throws Exception {
AliasCache ac = new AliasCache();
AliasManager abm1 = new AliasManagerImpl();

for (int i = 0; i < 5; i++) {
int retries = 10;
boolean succeeded = false;
String is = Integer.toString(i);
abm1.putAlias("a1", ImmutableList.of(is));
while (retries-- > 0) {
if (ImmutableList.of(is).equals(ac.getJobs("a1"))) {
succeeded = true;
break;
}
Thread.sleep(500);
}
assertTrue("failed to register updates after retrying", succeeded);
}
}
//
// @Test
// public void testGetJob_Loop() throws Exception {
// AliasCache ac = new AliasCache();
// AliasManager abm1 = new AliasManagerImpl();
//
// for (int i = 0; i < 5; i++) {
// int retries = 10;
// boolean succeeded = false;
// String is = Integer.toString(i);
// abm1.putAlias("a1", ImmutableList.of(is));
// while (retries-- > 0) {
// if (ImmutableList.of(is).equals(ac.getJobs("a1"))) {
// succeeded = true;
// break;
// }
// Thread.sleep(500);
// }
// assertTrue("failed to register updates after retrying", succeeded);
// }
// }
}