ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [15/50] [abbrv] incubator-ignite git commit: IGNITE-61 - Direct marshalling (fixes after review)
Date Wed, 11 Feb 2015 00:24:42 GMT
IGNITE-61 - Direct marshalling (fixes after review)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/150e25bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/150e25bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/150e25bd

Branch: refs/heads/ignite-55
Commit: 150e25bdf9017cc3b1562b92ed9917efaefa9934
Parents: 3dab05e
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Mon Feb 9 18:23:33 2015 -0800
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Mon Feb 9 18:23:33 2015 -0800

----------------------------------------------------------------------
 .../discovery/GridDiscoveryManager.java         | 17 -------
 .../extensions/discovery/DiscoveryCallback.java | 51 --------------------
 2 files changed, 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/150e25bd/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 834e649..39df697 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -34,7 +34,6 @@ import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.internal.util.worker.*;
 import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.discovery.*;
 import org.apache.ignite.plugin.security.*;
 import org.apache.ignite.plugin.segmentation.*;
 import org.apache.ignite.spi.*;
@@ -266,11 +265,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi>
{
                         c.updateAlives(node);
                 }
 
-                if (type == EVT_NODE_JOINED) {
-                    for (DiscoveryCallback listener : ctx.plugins().extensions(DiscoveryCallback.class))
-                        listener.beforeNodeJoined(node);
-                }
-
                 // Put topology snapshot into discovery history.
                 // There is no race possible between history maintenance and concurrent discovery
                 // event notifications, since SPI notifies manager about all events from
this listener.
@@ -369,11 +363,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi>
{
 
         topVer.setIfGreater(locNode.order());
 
-        for (DiscoveryCallback listener : ctx.plugins().extensions(DiscoveryCallback.class))
{
-            listener.onStart(discoCache().remoteNodes());
-            listener.onStart(discoCache().daemonNodes());
-        }
-
         // Start discovery worker.
         new IgniteThread(discoWrk).start();
 
@@ -1416,9 +1405,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi>
{
                     if (hasRslvrs)
                         segChkWrk.scheduleSegmentCheck();
 
-                    for (DiscoveryCallback listener : ctx.plugins().extensions(DiscoveryCallback.class))
-                        listener.onNodeLeft(node);
-
                     if (!isDaemon) {
                         if (!isLocDaemon) {
                             if (log.isInfoEnabled())
@@ -1440,9 +1426,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi>
{
                     if (hasRslvrs)
                         segChkWrk.scheduleSegmentCheck();
 
-                    for (DiscoveryCallback listener : ctx.plugins().extensions(DiscoveryCallback.class))
-                        listener.onNodeLeft(node);
-
                     if (!isDaemon) {
                         if (!isLocDaemon) {
                             U.warn(log, "Node FAILED: " + node);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/150e25bd/modules/core/src/main/java/org/apache/ignite/plugin/extensions/discovery/DiscoveryCallback.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/discovery/DiscoveryCallback.java
b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/discovery/DiscoveryCallback.java
deleted file mode 100644
index 3ff848a..0000000
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/discovery/DiscoveryCallback.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.plugin.extensions.discovery;
-
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.plugin.*;
-
-import java.util.*;
-
-/**
- * Plugin extension that allows to listen messages from discovery.
- *
- * TODO 9447: redesign.
- */
-public interface DiscoveryCallback extends Extension {
-    /**
-     * Handles node start.
-     *
-     * @param remoteNodes Remote grid nodes.
-     */
-    public void onStart(Collection<ClusterNode> remoteNodes);
-
-    /**
-     * Handles node joined event.
-     *
-     * @param node Joined node.
-     */
-    public void beforeNodeJoined(ClusterNode node);
-
-    /**
-     * Handles node left event.
-     *
-     * @param node Left node.
-     */
-    public void onNodeLeft(ClusterNode node);
-}


Mime
View raw message