for (int i = 0; i < ag.size(); i++) {
reg.addNode((Node) ag.get(i).getNode());
- delGNodeFromList( (Node) ag.get(i).getNode() ) ;
+ delGNodeFromList( (Node) ag.get(i).getNode(), 0 ) ;
// gnodes.remove(ag.get(i));
// Register.Instance().removeNode((Node) ag.get(i).getNode());
}
{
sup = al.getOtherGNode( gnodes ) ;
reg.addNodeBeg( (Node) sup.getNode() ) ;
- delGNodeFromList( (Node) sup.getNode() ) ;
+ delGNodeFromList( (Node) sup.getNode(), 0 ) ;
}
}
/** Recherche nouveau noeud **/
/*****************************************/
- protected GNode delGNodeFromList( Node _n )
+ protected GNode delGNodeFromList( Node _n, int _mode )
{
GNode removedGNode = null ;
free = true ;
}
- for( int i = 0 ; i < gnodes.size() ; i++ )
+ /** The dead node is not in the mapping **/
+ if( _mode == 0 )
{
- if( ((Node)gnodes.get(i).getNode()).getId() == _n.getId() )
+ for( int i = 0 ; i < gnodes.size() ; i++ )
{
- removedGNode = gnodes.remove( i ) ;
- Register.Instance().removeNodeOfName( removedGNode.getName() ) ;
- break ;
+ if( ((Node)gnodes.get(i).getNode()).getId() == _n.getId() )
+ {
+ removedGNode = gnodes.remove( i ) ;
+ Register.Instance().removeNodeOfName( removedGNode.getName() ) ;
+ break ;
+ }
}
}
+
+ /** The dead node is in the mapping **/
+ if( _mode == 1 )
+ {
+ ArrayList<GNode> temp = al.getMapping().getMappedGNodes() ;
+
+ for( int i = 0 ; i < temp.size() ; i++ )
+ {
+ if( ((Node)temp.get(i).getNode()).getId() == _n.getId() )
+ {
+ removedGNode = temp.get( i ) ;
+ Register.Instance().removeNodeOfName( removedGNode.getName() ) ;
+ break ;
+ }
+ }
+ }
+
// daemonListChange = true ;
if( _deadNode != null )
{
- gnode = delGNodeFromList( _deadNode ) ;
-
+ authorized = true ;
+
+ gnode = delGNodeFromList( _deadNode, 1 ) ;
+
remp = al.replaceNode( gnode, gnodes ) ;
if( remp != null )
System.out.println( "Replacing node found." ) ;
node = (Node) remp.getNode() ;
- authorized = true ;
+ delGNodeFromList( node, 0 ) ;
- delGNodeFromList( node ) ;
+ /** Updating all mapping **/
+ updateMappedNode( gnode, remp ) ;
+ propagateReplaceNode( gnode, remp ) ;
authorized = false ;
authorized = true ;
- delGNodeFromList( node ) ;
+ delGNodeFromList( node, 0 ) ;
authorized = false ;
return node ;
}
+ @Override
+ public void updateMappedNode( GNode _dead, GNode _remp )
+ {
+ int pos = 0 ;
+ pos = al.getMapping().getIdOfAssociation( _dead ) ;
+
+ if( pos == -1 )
+ {
+ System.err.println( "GNode "+_dead+" does not exist in the mapping!" ) ;
+ return ;
+ }
+
+ al.getMapping().getMapping().get( pos ).setGNode( _remp ) ;
+
+ System.out.println( "Succesfully replacing the fallen node in the mapping." ) ;
+ }
+
+ /**
+ * Inform all SuperNodes of the replacement of a fallen computing node.
+ * @param _dead The fallen node
+ * @param _remp The replacing node
+ */
+ private void propagateReplaceNode( GNode _dead, GNode _remp ) throws RemoteException
+ {
+ if( _dead != null && _remp != null )
+ {
+ SuperNodeListe.Instance().propagateReplaceNode( _dead, _remp ) ;
+ }
+ }
+
/**********************************************************/
/**********************************************************/
@Override
+ /**
+ * Add a new node in the list.
+ * @param _g The new node
+ */
public void addGNode( GNode _g ) throws RemoteException
{
if( _g != null )
{
- workingOnGnodes() ;
+ boolean free = false ;
+
+ if( ! operating )
+ {
+ workingOnGnodes() ;
+ free = true ;
+ }
gnodes.add( _g ) ;
- operating = false ;
+ if( free )
+ operating = false ;
}
}
if( ((Node)gnodes.get(i).getNode()).getId() == ((Node)_g.getNode()).getId() )
{
gnodes.remove( i ) ;
+ Register.Instance().removeNodeOfName( _g.getName() ) ;
break ;
}
}