Merge 7.2->7.3

Author: frazerclement

storage/ndb/src/kernel/blocks/LocalProxy.cpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@ LocalProxy::LocalProxy(BlockNumber blockNumber, Block_context& ctx) :
   for (i = 0; i < MaxWorkers; i++)
     c_worker[i] = 0;
 
+  c_anyWorkerCounter = 0;
   c_typeOfStart = NodeState::ST_ILLEGAL_TYPE;
   c_masterNodeId = ZNIL;
 
@@ -305,6 +306,37 @@ LocalProxy::loadWorkers()
   }
 }
 
+void
+LocalProxy::forwardToWorkerIndex(Signal* signal, Uint32 index)
+{
+  jam();
+  /**
+   * We statelessly forward to one of our 
+   * workers, including any sections that 
+   * might be attached.
+   */
+  BlockReference destRef = workerRef(index);
+  SectionHandle sh(this, signal);
+  
+  sendSignal(destRef,
+             signal->header.theVerId_signalNumber,
+             signal,
+             signal->getLength(),
+             JBB,
+             &sh);
+};
+
+void
+LocalProxy::forwardToAnyWorker(Signal* signal)
+{
+  jam();
+
+  /* Won't work for fragmented signals */
+  ndbassert(signal->header.m_fragmentInfo == 0);
+
+  forwardToWorkerIndex(signal, getAnyWorkerIndex());
+}
+
 // GSN_READ_CONFIG_REQ
 
 void

storage/ndb/src/kernel/blocks/LocalProxy.hpp

@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -64,6 +64,7 @@ class LocalProxy : public SimulatedBlock {
   Uint32 c_workers;
   // no gaps - extra worker has index c_lqhWorkers (not MaxLqhWorkers)
   SimulatedBlock* c_worker[MaxWorkers];
+  Uint32 c_anyWorkerCounter;
 
   virtual SimulatedBlock* newWorker(Uint32 instanceNo) = 0;
   virtual void loadWorkers();
@@ -94,6 +95,22 @@ class LocalProxy : public SimulatedBlock {
     return ino - 1;
   }
 
+  // Get a worker index - will balance round robin across
+  // workers over time.
+  Uint32 getAnyWorkerIndex()
+  {
+    return (c_anyWorkerCounter++) % c_workers;
+  }
+
+  // Statelessly forward a signal (including any sections) 
+  // to the worker with the supplied index.
+  void forwardToWorkerIndex(Signal* signal, Uint32 index);
+  
+  // Statelessly forward the signal (including any sections)
+  // to one of the workers, load balancing.
+  // Requires no arrival order constraints between signals.
+  void forwardToAnyWorker(Signal* signal);
+
   // support routines and classes ("Ss" = signal state)
 
   typedef void (LocalProxy::*SsFUNCREQ)(Signal*, Uint32 ssId, SectionHandle*);

storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2010, 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16436,33 +16436,33 @@ void Dbdih::makeNodeGroups(Uint32 nodeArray[])
  */
 void Dbdih::execCHECKNODEGROUPSREQ(Signal* signal)
 {
-  jamEntry();
+  jamNoBlock();
   CheckNodeGroups* sd = (CheckNodeGroups*)&signal->theData[0];
 
   bool direct = (sd->requestType & CheckNodeGroups::Direct);
   bool ok = false;
   switch(sd->requestType & ~CheckNodeGroups::Direct){
   case CheckNodeGroups::ArbitCheck:{
     ok = true;
-    jam();
+    jamNoBlock();
     unsigned missall = 0;
     unsigned haveall = 0;
     for (Uint32 i = 0; i < cnoOfNodeGroups; i++) {
-      jam();
+      jamNoBlock();
       NodeGroupRecordPtr ngPtr;
       ngPtr.i = c_node_groups[i];
       ptrAss(ngPtr, nodeGroupRecord);
       Uint32 count = 0;
       for (Uint32 j = 0; j < ngPtr.p->nodeCount; j++) {
-	jam();
+	jamNoBlock();
 	Uint32 nodeId = ngPtr.p->nodesInGroup[j];
 	if (sd->mask.get(nodeId)) {
-	  jam();
+	  jamNoBlock();
 	  count++;
 	}//if
       }//for
       if (count == 0) {
-	jam();
+	jamNoBlock();
 	missall++;
       }//if
       if (count == ngPtr.p->nodeCount) {
@@ -16471,13 +16471,13 @@ void Dbdih::execCHECKNODEGROUPSREQ(Signal* signal)
     }//for
 
     if (missall) {
-      jam();
+      jamNoBlock();
       sd->output = CheckNodeGroups::Lose;
     } else if (haveall) {
-      jam();
+      jamNoBlock();
       sd->output = CheckNodeGroups::Win;
     } else {
-      jam();
+      jamNoBlock();
       sd->output = CheckNodeGroups::Partitioning;
     }//if
   }
@@ -16503,17 +16503,17 @@ void Dbdih::execCHECKNODEGROUPSREQ(Signal* signal)
     ngPtr.i = ng;
     if (ngPtr.i != RNIL)
     {
-      jam();
+      jamNoBlock();
       ptrAss(ngPtr, nodeGroupRecord);
       for (Uint32 j = 0; j < ngPtr.p->nodeCount; j++) {
-        jam();
+        jamNoBlock();
         sd->mask.set(ngPtr.p->nodesInGroup[j]);
       }
     }
     break;
   }
   case CheckNodeGroups::GetDefaultFragments:
-    jam();
+    jamNoBlock();
     ok = true;
     sd->output = (cnoOfNodeGroups + sd->extraNodeGroups)
       * getFragmentsPerNode() * cnoReplicas;

storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -9826,7 +9826,7 @@ Dbtc::routeTCKEY_FAILREFCONF(Signal* signal, const ApiConnectRecord* regApiPtr,
     CheckNodeGroups::GetNodeGroupMembers;
   sd->nodeId = node;
   EXECUTE_DIRECT(DBDIH, GSN_CHECKNODEGROUPSREQ, signal, 
-		 CheckNodeGroups::SignalLength);
+		 CheckNodeGroups::SignalLength, 0);
   jamEntry();
 
   NdbNodeBitmask mask;

storage/ndb/src/kernel/blocks/dbtc/DbtcProxy.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -62,6 +62,11 @@ DbtcProxy::DbtcProxy(Block_context& ctx) :
   addRecSignal(GSN_ABORT_ALL_REF,&DbtcProxy::execABORT_ALL_REF);
   addRecSignal(GSN_ABORT_ALL_CONF,&DbtcProxy::execABORT_ALL_CONF);
 
+  // Routed signals are distributed across the workers
+  // This requires that there's no ordering constraints between them
+  // GSN_TCKEY_FAILREFCONF_R
+  addRecSignal(GSN_TCKEY_FAILREFCONF_R, &DbtcProxy::forwardToAnyWorker);
+
   // GSN_CREATE_FK_IMPL_REQ
   addRecSignal(GSN_CREATE_FK_IMPL_REQ, &DbtcProxy::execCREATE_FK_IMPL_REQ);
   addRecSignal(GSN_CREATE_FK_IMPL_CONF,&DbtcProxy::execCREATE_FK_IMPL_CONF);