You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2018/12/11 14:54:16 UTC
[1/2] asterixdb-bad git commit: [ASTERIXDB-2490][BAD] Coordinated
Change For Encrypted IPC
Repository: asterixdb-bad
Updated Branches:
refs/heads/master ed3aff538 -> f9c301447
[ASTERIXDB-2490][BAD] Coordinated Change For Encrypted IPC
Change-Id: I3792fc7937aec09a263b365b50f281c9aca9b883
Project: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/commit/c9a7882f
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/tree/c9a7882f
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/diff/c9a7882f
Branch: refs/heads/master
Commit: c9a7882ff5e84ca2745aaa151fc99f2fdc6eb796
Parents: 64c2ad2
Author: Murtadha Hubail <mu...@couchbase.com>
Authored: Wed Dec 5 19:53:48 2018 +0300
Committer: Murtadha Hubail <mu...@couchbase.com>
Committed: Wed Dec 5 19:53:48 2018 +0300
----------------------------------------------------------------------
.../asterix/bad/recovery/BADGlobalRecoveryManager.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb-bad/blob/c9a7882f/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java
----------------------------------------------------------------------
diff --git a/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java b/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java
index d2a6613..3fab8ba 100644
--- a/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java
+++ b/asterix-bad/src/main/java/org/apache/asterix/bad/recovery/BADGlobalRecoveryManager.java
@@ -145,12 +145,12 @@ public class BADGlobalRecoveryManager extends GlobalRecoveryManager {
listener.suspend();
activeEventHandler.registerListener(listener);
BADJobService.redeployJobSpec(entityId, procedure.getBody(), metadataProvider, badStatementExecutor, hcc,
- new RequestParameters(
- new ResultSet(hcc, appCtx.getCompilerProperties().getFrameSize(),
- ResultReader.NUM_READERS),
+ new RequestParameters(new ResultSet(hcc,
+ appCtx.getServiceContext().getControllerService().getNetworkSecurityManager()
+ .getSocketChannelFactory(), appCtx.getCompilerProperties().getFrameSize(),
+ ResultReader.NUM_READERS),
new ResultProperties(IStatementExecutor.ResultDelivery.IMMEDIATE),
- new IStatementExecutor.Stats(), null, null, null, null, true),
- true);
+ new IStatementExecutor.Stats(), null, null, null, null, true), true);
metadataProvider.getLocks().unlock();
//Log that the procedure stopped by cluster restart. Procedure is available again now.
LOGGER.log(Level.SEVERE, entityId.getExtensionName() + " " + entityId.getDataverse() + "."
[2/2] asterixdb-bad git commit: Merge "[ASTERIXDB-2490][BAD]
Coordinated Change For Encrypted IPC"
Posted by mb...@apache.org.
Merge "[ASTERIXDB-2490][BAD] Coordinated Change For Encrypted IPC"
Project: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/commit/f9c30144
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/tree/f9c30144
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb-bad/diff/f9c30144
Branch: refs/heads/master
Commit: f9c3014475ba15c9537c3e6a2f2beb28ce0b8ddc
Parents: ed3aff5 c9a7882
Author: Murtadha Hubail <mh...@apache.org>
Authored: Mon Dec 10 19:09:34 2018 -0800
Committer: Apache AsterixDB Gerrit <do...@asterixdb.incubator.apache.org>
Committed: Mon Dec 10 19:09:34 2018 -0800
----------------------------------------------------------------------
.../asterix/bad/recovery/BADGlobalRecoveryManager.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------