Repository: lens Updated Branches: refs/heads/master 38ab6c608 -> 34f15c6e2
LENS-1358: Lens server snapshotter failing when there's a jdbc query running while snapshotting Project: http://git-wip-us.apache.org/repos/asf/lens/repo Commit: http://git-wip-us.apache.org/repos/asf/lens/commit/34f15c6e Tree: http://git-wip-us.apache.org/repos/asf/lens/tree/34f15c6e Diff: http://git-wip-us.apache.org/repos/asf/lens/diff/34f15c6e Branch: refs/heads/master Commit: 34f15c6e24ef4604ef431765c3f23c799a44bec1 Parents: 38ab6c6 Author: Rajat Khandelwal <pro...@apache.org> Authored: Mon Oct 17 12:58:48 2016 +0530 Committer: Rajat Khandelwal <rajatgupt...@gmail.com> Committed: Mon Oct 17 12:58:48 2016 +0530 ---------------------------------------------------------------------- .../apache/lens/server/api/query/QueryContext.java | 4 ++-- .../server/api/query/TestAbstractQueryContext.java | 16 ++++++---------- .../lens/server/api/query/TestQueryContext.java | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lens/blob/34f15c6e/lens-server-api/src/main/java/org/apache/lens/server/api/query/QueryContext.java ---------------------------------------------------------------------- diff --git a/lens-server-api/src/main/java/org/apache/lens/server/api/query/QueryContext.java b/lens-server-api/src/main/java/org/apache/lens/server/api/query/QueryContext.java index 63d3539..64c7145 100644 --- a/lens-server-api/src/main/java/org/apache/lens/server/api/query/QueryContext.java +++ b/lens-server-api/src/main/java/org/apache/lens/server/api/query/QueryContext.java @@ -201,8 +201,7 @@ public class QueryContext extends AbstractQueryContext implements FailureContext @Getter @Setter private transient Future queryLauncher; - - private final List<QueryDriverStatusUpdateListener> driverStatusUpdateListeners = Lists.newArrayList(); + transient List<QueryDriverStatusUpdateListener> driverStatusUpdateListeners = Lists.newArrayList(); @Getter @Setter List<FailedAttempt> failedAttempts = Lists.newArrayList(); @@ -310,6 +309,7 @@ public class QueryContext extends AbstractQueryContext implements FailureContext public void initTransientState() { super.initTransientState(); statusUpdateFailures = new StatusUpdateFailureContext(); + driverStatusUpdateListeners = Lists.newArrayList(); } /** http://git-wip-us.apache.org/repos/asf/lens/blob/34f15c6e/lens-server-api/src/test/java/org/apache/lens/server/api/query/TestAbstractQueryContext.java ---------------------------------------------------------------------- diff --git a/lens-server-api/src/test/java/org/apache/lens/server/api/query/TestAbstractQueryContext.java b/lens-server-api/src/test/java/org/apache/lens/server/api/query/TestAbstractQueryContext.java index 36cc8fa..f5af0d1 100644 --- a/lens-server-api/src/test/java/org/apache/lens/server/api/query/TestAbstractQueryContext.java +++ b/lens-server-api/src/test/java/org/apache/lens/server/api/query/TestAbstractQueryContext.java @@ -73,26 +73,22 @@ public class TestAbstractQueryContext { public void testTransientState() throws LensException, IOException, ClassNotFoundException { MockQueryContext ctx = new MockQueryContext(); ByteArrayOutputStream bios = new ByteArrayOutputStream(); - ObjectOutputStream out = new ObjectOutputStream(bios); - byte[] ctxBytes = null; - try { + byte[] ctxBytes; + try (ObjectOutputStream out = new ObjectOutputStream(bios)) { out.writeObject(ctx); ctxBytes = bios.toByteArray(); - } finally { - out.close(); } ByteArrayInputStream bais = new ByteArrayInputStream(ctxBytes); - ObjectInputStream in = new ObjectInputStream(bais); - MockQueryContext ctxRead = null; - try { + MockQueryContext ctxRead; + try (ObjectInputStream in = new ObjectInputStream(bais)) { ctxRead = (MockQueryContext) in.readObject(); - } finally { - in.close(); } ctxRead.initTransientState(); ctxRead.setConf(ctx.getConf()); assertNotNull(ctxRead.getHiveConf()); assertNotNull(ctxRead.statusUpdateFailures); + assertNotNull(ctxRead.driverStatusUpdateListeners); + assertEquals(ctxRead.driverStatusUpdateListeners.size(), 0); } @Test http://git-wip-us.apache.org/repos/asf/lens/blob/34f15c6e/lens-server-api/src/test/java/org/apache/lens/server/api/query/TestQueryContext.java ---------------------------------------------------------------------- diff --git a/lens-server-api/src/test/java/org/apache/lens/server/api/query/TestQueryContext.java b/lens-server-api/src/test/java/org/apache/lens/server/api/query/TestQueryContext.java index 1560bf1..d1b3d5f 100644 --- a/lens-server-api/src/test/java/org/apache/lens/server/api/query/TestQueryContext.java +++ b/lens-server-api/src/test/java/org/apache/lens/server/api/query/TestQueryContext.java @@ -74,7 +74,7 @@ public class TestQueryContext { } @Test - public void testUpdateDriverStatusRetrieExhausts() throws LensException { + public void testUpdateDriverStatusRetriesExhaust() throws LensException { Configuration conf = new Configuration(); List<LensDriver> drivers = MockQueryContext.getDrivers(conf); MockQueryContext ctx = new MockQueryContext("simulate status failure", new LensConf(), conf, drivers);