# ignite-26
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aad27508 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aad27508 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aad27508 Branch: refs/heads/ignite-26 Commit: aad275086a95de87fa69d42d19dfe714925747e0 Parents: 7cdd0c1 7eebc7e Author: sboikov <sboi...@gridgain.com> Authored: Thu Jan 29 18:31:56 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jan 29 18:31:56 2015 +0300 ---------------------------------------------------------------------- ipc/shmem/Makefile.am | 2 +- ipc/shmem/Makefile.in | 2 +- ipc/shmem/configure | 4 +- ipc/shmem/configure.ac | 2 +- ipc/shmem/ggshmem/Makefile.am | 23 - ipc/shmem/ggshmem/Makefile.in | 589 -- ..._util_ipc_shmem_GridIpcSharedMemoryUtils.cpp | 882 -- ipc/shmem/igniteshmem/Makefile.am | 23 + ipc/shmem/igniteshmem/Makefile.in | 589 ++ ...rnal_util_ipc_shmem_IpcSharedMemoryUtils.cpp | 882 ++ ipc/shmem/include/Makefile.am | 2 +- ipc/shmem/include/Makefile.in | 2 +- ...ternal_util_ipc_shmem_IpcSharedMemoryUtils.h | 117 + ...id_util_ipc_shmem_GridIpcSharedMemoryUtils.h | 117 - ipc/shmem/readme.txt | 9 +- .../spi/checkpoint/s3/S3CheckpointSpi.java | 4 +- .../ClientPropertiesConfigurationSelfTest.java | 4 +- .../java/META-INF/native/linux64/libggshmem.so | Bin 138023 -> 0 bytes .../META-INF/native/linux64/libigniteshmem.so | Bin 0 -> 138345 bytes .../java/META-INF/native/osx/libggshmem.dylib | Bin 32940 -> 0 bytes .../META-INF/native/osx/libigniteshmem.dylib | Bin 0 -> 33116 bytes .../apache/ignite/IgniteCheckedException.java | 2 +- .../java/org/apache/ignite/IgniteException.java | 2 +- .../compute/ComputeTaskTimeoutException.java | 41 +- .../internal/ComputeTaskInternalFuture.java | 151 + .../ignite/internal/GridTaskFutureImpl.java | 151 - .../ComputeTaskTimeoutCheckedException.java | 61 + .../cache/GridCacheDeploymentManager.java | 2 +- .../cache/GridCacheMvccCandidate.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 22 +- .../internal/processors/fs/GridGgfsServer.java | 26 +- .../processors/fs/GridGgfsServerManager.java | 8 +- .../processors/fs/IgniteFsNoopProcessor.java | 2 +- .../processors/fs/IgniteFsProcessor.java | 4 +- .../processors/fs/IgniteFsProcessorAdapter.java | 2 +- .../service/GridServiceProcessor.java | 2 +- .../apache/ignite/internal/util/GridUtils.java | 9124 ----------------- .../ignite/internal/util/IgniteUtils.java | 9165 ++++++++++++++++++ .../internal/util/ipc/GridIpcEndpoint.java | 49 - .../util/ipc/GridIpcEndpointBindException.java | 47 - .../util/ipc/GridIpcEndpointFactory.java | 84 - .../internal/util/ipc/GridIpcEndpointType.java | 29 - .../util/ipc/GridIpcServerEndpoint.java | 73 - .../ipc/GridIpcServerEndpointDeserializer.java | 66 - .../internal/util/ipc/GridIpcToNioAdapter.java | 250 - .../ignite/internal/util/ipc/IpcEndpoint.java | 49 + .../util/ipc/IpcEndpointBindException.java | 47 + .../internal/util/ipc/IpcEndpointFactory.java | 84 + .../internal/util/ipc/IpcEndpointType.java | 29 + .../internal/util/ipc/IpcServerEndpoint.java | 73 + .../util/ipc/IpcServerEndpointDeserializer.java | 66 + .../internal/util/ipc/IpcToNioAdapter.java | 250 + .../ipc/loopback/GridIpcClientTcpEndpoint.java | 87 - .../ipc/loopback/GridIpcServerTcpEndpoint.java | 179 - .../util/ipc/loopback/IpcClientTcpEndpoint.java | 87 + .../util/ipc/loopback/IpcServerTcpEndpoint.java | 179 + .../GridIpcOutOfSystemResourcesException.java | 59 - .../GridIpcSharedMemoryClientEndpoint.java | 336 - .../shmem/GridIpcSharedMemoryInitRequest.java | 67 - .../shmem/GridIpcSharedMemoryInitResponse.java | 171 - .../shmem/GridIpcSharedMemoryInputStream.java | 99 - .../shmem/GridIpcSharedMemoryNativeLoader.java | 242 - ...cSharedMemoryOperationTimedoutException.java | 59 - .../shmem/GridIpcSharedMemoryOutputStream.java | 80 - .../GridIpcSharedMemoryServerEndpoint.java | 708 -- .../ipc/shmem/GridIpcSharedMemorySpace.java | 374 - .../ipc/shmem/GridIpcSharedMemoryUtils.java | 242 - .../shmem/IpcOutOfSystemResourcesException.java | 59 + .../shmem/IpcSharedMemoryClientEndpoint.java | 336 + .../ipc/shmem/IpcSharedMemoryInitRequest.java | 67 + .../ipc/shmem/IpcSharedMemoryInitResponse.java | 171 + .../ipc/shmem/IpcSharedMemoryInputStream.java | 99 + .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 261 + ...cSharedMemoryOperationTimedoutException.java | 59 + .../ipc/shmem/IpcSharedMemoryOutputStream.java | 80 + .../shmem/IpcSharedMemoryServerEndpoint.java | 708 ++ .../util/ipc/shmem/IpcSharedMemorySpace.java | 374 + .../util/ipc/shmem/IpcSharedMemoryUtils.java | 242 + .../util/nio/GridShmemCommunicationClient.java | 4 +- .../internal/util/typedef/internal/U.java | 4 +- .../visor/misc/VisorResolveHostNameTask.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 4 +- .../internal/visor/query/VisorQueryUtils.java | 4 +- .../ignite/lang/IgniteAsyncSupportAdapter.java | 27 +- .../optimized/IgniteOptimizedMarshaller.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 24 +- .../IgniteExceptionHelpLinksSelfTest.java | 3 +- .../GridEventStorageCheckAllEventsSelfTest.java | 2 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 10 +- .../GridCacheReturnValueTransferSelfTest.java | 2 +- .../cache/IgniteCacheInvokeAbstractTest.java | 4 +- ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- ...IpcEndpointRegistrationAbstractSelfTest.java | 4 +- ...pcEndpointRegistrationOnWindowsSelfTest.java | 4 +- .../cache/GridCacheCommandHandlerSelfTest.java | 4 +- ...artupWithSpecifiedWorkDirectorySelfTest.java | 2 +- ...tartupWithUndefinedGridGainHomeSelfTest.java | 4 +- .../internal/util/GridTestClockTimer.java | 6 +- .../ignite/internal/util/GridUtilsSelfTest.java | 717 -- .../internal/util/IgniteUtilsSelfTest.java | 728 ++ ...idIpcServerEndpointDeserializerSelfTest.java | 160 - .../IpcServerEndpointDeserializerSelfTest.java | 160 + .../ipc/shmem/GgfsSharedMemoryTestClient.java | 76 + .../ipc/shmem/GgfsSharedMemoryTestServer.java | 71 + .../shmem/GridGgfsSharedMemoryTestClient.java | 76 - .../shmem/GridGgfsSharedMemoryTestServer.java | 71 - ...idIpcSharedMemoryCrashDetectionSelfTest.java | 500 - .../shmem/GridIpcSharedMemoryFakeClient.java | 36 - .../shmem/GridIpcSharedMemoryNodeStartup.java | 87 - .../shmem/GridIpcSharedMemorySpaceSelfTest.java | 267 - .../shmem/GridIpcSharedMemoryUtilsSelfTest.java | 84 - .../IpcSharedMemoryCrashDetectionSelfTest.java | 500 + .../ipc/shmem/IpcSharedMemoryFakeClient.java | 36 + .../IpcSharedMemoryNativeLoaderSelfTest.java | 78 + .../ipc/shmem/IpcSharedMemoryNodeStartup.java | 87 + .../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 267 + .../ipc/shmem/IpcSharedMemoryUtilsSelfTest.java | 84 + .../LoadWithCorruptedLibFileTestRunner.java | 65 + .../GridIpcSharedMemoryBenchmarkParty.java | 35 - .../GridIpcSharedMemoryBenchmarkReader.java | 133 - .../GridIpcSharedMemoryBenchmarkWriter.java | 125 - .../IpcSharedMemoryBenchmarkParty.java | 35 + .../IpcSharedMemoryBenchmarkReader.java | 133 + .../IpcSharedMemoryBenchmarkWriter.java | 125 + .../ignite/lang/GridSetWrapperSelfTest.java | 2 +- .../ignite/testsuites/IgniteFsTestSuite.java | 2 +- .../IgniteIpcSharedMemorySelfTestSuite.java | 7 +- .../testsuites/IgniteUtilSelfTestSuite.java | 2 +- .../internal/fs/hadoop/GridGgfsHadoopIpcIo.java | 10 +- .../GridHadoopExternalCommunication.java | 26 +- .../GridHadoopIpcToNioAdapter.java | 6 +- ...doop20FileSystemLoopbackPrimarySelfTest.java | 2 +- ...sHadoop20FileSystemShmemPrimarySelfTest.java | 2 +- .../GridGgfsHadoopFileSystemClientSelfTest.java | 2 +- ...idGgfsHadoopFileSystemHandshakeSelfTest.java | 2 +- ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java | 2 +- ...adoopFileSystemLoopbackAbstractSelfTest.java | 2 +- ...fsHadoopFileSystemShmemAbstractSelfTest.java | 8 +- .../fs/GridGgfsNearOnlyMultiNodeSelfTest.java | 4 +- .../ignite/fs/IgniteFsEventsTestSuite.java | 4 +- .../ignite/visor/commands/VisorConsole.scala | 6 +- .../commands/alert/VisorAlertCommand.scala | 4 +- .../config/VisorConfigurationCommand.scala | 6 +- .../commands/deploy/VisorDeployCommand.scala | 4 +- .../commands/disco/VisorDiscoveryCommand.scala | 4 +- .../commands/events/VisorEventsCommand.scala | 4 +- .../visor/commands/node/VisorNodeCommand.scala | 4 +- .../commands/start/VisorStartCommand.scala | 4 +- .../commands/tasks/VisorTasksCommand.scala | 4 +- .../commands/top/VisorTopologyCommand.scala | 6 +- .../visor/commands/vvm/VisorVvmCommand.scala | 8 +- .../scala/org/apache/ignite/visor/visor.scala | 20 +- 152 files changed, 16942 insertions(+), 16712 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aad27508/modules/aws/src/main/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aad27508/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskTimeoutException.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskTimeoutException.java index d00a40d,d00a40d..9739227 --- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskTimeoutException.java +++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskTimeoutException.java @@@ -17,45 -17,45 +17,8 @@@ package org.apache.ignite.compute; --import org.apache.ignite.*; --import org.jetbrains.annotations.*; -- /** -- * This exception indicates that task execution timed out. It is thrown from -- * {@link ComputeTaskFuture#get()} method. ++ * TODO */ --public class ComputeTaskTimeoutException extends IgniteCheckedException { -- /** */ -- private static final long serialVersionUID = 0L; -- -- /** -- * Creates task timeout exception with given task execution ID and -- * error message. -- * -- * @param msg Error message. -- */ -- public ComputeTaskTimeoutException(String msg) { -- super(msg); -- } -- -- /** -- * Creates new task timeout exception given throwable as a cause and -- * source of error message. -- * -- * @param cause Non-null throwable cause. -- */ -- public ComputeTaskTimeoutException(Throwable cause) { -- this(cause.getMessage(), cause); -- } -- -- /** -- * Creates task timeout exception with given task execution ID, -- * error message and optional nested exception. -- * -- * @param msg Error message. -- * @param cause Optional nested exception (can be {@code null}). -- */ -- public ComputeTaskTimeoutException(String msg, @Nullable Throwable cause) { -- super(msg, cause); -- } ++public class ComputeTaskTimeoutException { } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aad27508/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java index 0000000,0000000..bdccb75 new file mode 100644 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/ComputeTaskInternalFuture.java @@@ -1,0 -1,0 +1,151 @@@ ++/* ++ * 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.internal; ++ ++import org.apache.ignite.*; ++import org.apache.ignite.cluster.*; ++import org.apache.ignite.compute.*; ++import org.apache.ignite.plugin.security.*; ++import org.apache.ignite.internal.util.future.*; ++import org.apache.ignite.internal.util.typedef.internal.*; ++ ++import java.io.*; ++import java.util.*; ++ ++/** ++ * This class provide implementation for task future. ++ * @param <R> Type of the task result returning from {@link ComputeTask#reduce(List)} method. ++ */ ++public class ComputeTaskInternalFuture<R> extends GridFutureAdapter<R> { ++ /** */ ++ private static final long serialVersionUID = 0L; ++ ++ /** */ ++ private ComputeTaskSession ses; ++ ++ /** */ ++ private GridKernalContext ctx; ++ ++ /** */ ++ private ComputeFuture<R> userFut; ++ ++ /** ++ * Required by {@link Externalizable}. ++ */ ++ public ComputeTaskInternalFuture() { ++ // No-op. ++ } ++ ++ /** ++ * @param ses Task session instance. ++ * @param ctx Kernal context. ++ */ ++ public ComputeTaskInternalFuture(ComputeTaskSession ses, GridKernalContext ctx) { ++ super(ctx); ++ ++ assert ses != null; ++ assert ctx != null; ++ ++ this.ses = ses; ++ this.ctx = ctx; ++ ++ userFut = new ComputeFuture<>(this); ++ } ++ ++ /** ++ * @return Future returned by public API. ++ */ ++ public ComputeTaskFuture<R> publicFuture() { ++ return userFut; ++ } ++ ++ /** ++ * Gets task timeout. ++ * ++ * @return Task timeout. ++ */ ++ public ComputeTaskSession getTaskSession() { ++ if (ses == null) ++ throw new IllegalStateException("Cannot access task session after future has been deserialized."); ++ ++ return ses; ++ } ++ ++ /** {@inheritDoc} */ ++ @Override public boolean cancel() throws IgniteCheckedException { ++ ctx.security().authorize(ses.getTaskName(), GridSecurityPermission.TASK_CANCEL, null); ++ ++ checkValid(); ++ ++ if (onCancelled()) { ++ ctx.task().onCancelled(ses.getId()); ++ ++ return true; ++ } ++ ++ return isCancelled(); ++ } ++ ++ /** ++ * Cancel task on master leave event. Does not send cancel request to remote jobs and invokes master-leave ++ * callback on local jobs. ++ * ++ * @return {@code True} if future was cancelled (i.e. was not finished prior to this call). ++ * @throws IgniteCheckedException If failed. ++ */ ++ public boolean cancelOnMasterLeave() throws IgniteCheckedException { ++ checkValid(); ++ ++ if (onCancelled()) { ++ // Invoke master-leave callback on spawned jobs on local node and then cancel them. ++ for (ClusterNode node : ctx.discovery().nodes(ses.getTopology())) { ++ if (ctx.localNodeId().equals(node.id())) { ++ ctx.job().masterLeaveLocal(ses.getId()); ++ ++ ctx.job().cancelJob(ses.getId(), null, false); ++ } ++ } ++ ++ return true; ++ } ++ ++ return isCancelled(); ++ } ++ ++ /** {@inheritDoc} */ ++ @Override public String toString() { ++ return S.toString(ComputeTaskInternalFuture.class, this, "super", super.toString()); ++ } ++ ++ /** ++ * ++ */ ++ private static class ComputeFuture<R> extends IgniteFutureImpl<R> implements ComputeTaskFuture<R> { ++ /** ++ * @param fut Future. ++ */ ++ private ComputeFuture(ComputeTaskInternalFuture<R> fut) { ++ super(fut); ++ } ++ ++ /** {@inheritDoc} */ ++ @Override public ComputeTaskSession getTaskSession() { ++ return ((ComputeTaskInternalFuture<R>)fut).getTaskSession(); ++ } ++ } ++} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aad27508/modules/core/src/main/java/org/apache/ignite/internal/GridTaskFutureImpl.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/GridTaskFutureImpl.java index 1958f9a,6f162d6..0000000 deleted file mode 100644,100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridTaskFutureImpl.java +++ /dev/null @@@ -1,151 -1,122 +1,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.internal; -- --import org.apache.ignite.*; --import org.apache.ignite.cluster.*; --import org.apache.ignite.compute.*; --import org.apache.ignite.plugin.security.*; --import org.apache.ignite.internal.util.future.*; --import org.apache.ignite.internal.util.typedef.internal.*; -- --import java.io.*; --import java.util.*; -- --/** -- * This class provide implementation for task future. -- * @param <R> Type of the task result returning from {@link org.apache.ignite.compute.ComputeTask#reduce(List)} method. -- */ - public class GridTaskFutureImpl<R> extends GridFutureAdapter<R> { -public class GridTaskFutureImpl<R> extends GridFutureAdapter<R> implements ComputeTaskFuture<R> { -- /** */ -- private static final long serialVersionUID = 0L; -- -- /** */ -- private ComputeTaskSession ses; -- -- /** */ -- private GridKernalContext ctx; - - /** */ - private ComputeFuture<R> userFut; -- -- /** -- * Required by {@link Externalizable}. -- */ -- public GridTaskFutureImpl() { -- // No-op. -- } -- -- /** -- * @param ses Task session instance. -- * @param ctx Kernal context. -- */ -- public GridTaskFutureImpl(ComputeTaskSession ses, GridKernalContext ctx) { -- super(ctx); -- -- assert ses != null; -- assert ctx != null; -- -- this.ses = ses; -- this.ctx = ctx; - - userFut = new ComputeFuture<>(this); - } - - /** - * @return Future returned by public API. - */ - public ComputeTaskFuture<R> publicFuture() { - return userFut; -- } -- -- /** -- * Gets task timeout. -- * -- * @return Task timeout. -- */ - public ComputeTaskSession getTaskSession() { - @Override public ComputeTaskSession getTaskSession() { -- if (ses == null) -- throw new IllegalStateException("Cannot access task session after future has been deserialized."); -- -- return ses; -- } -- -- /** {@inheritDoc} */ -- @Override public boolean cancel() throws IgniteCheckedException { -- ctx.security().authorize(ses.getTaskName(), GridSecurityPermission.TASK_CANCEL, null); -- -- checkValid(); -- -- if (onCancelled()) { -- ctx.task().onCancelled(ses.getId()); -- -- return true; -- } -- -- return isCancelled(); -- } -- -- /** -- * Cancel task on master leave event. Does not send cancel request to remote jobs and invokes master-leave -- * callback on local jobs. -- * -- * @return {@code True} if future was cancelled (i.e. was not finished prior to this call). -- * @throws IgniteCheckedException If failed. -- */ -- public boolean cancelOnMasterLeave() throws IgniteCheckedException { -- checkValid(); -- -- if (onCancelled()) { -- // Invoke master-leave callback on spawned jobs on local node and then cancel them. -- for (ClusterNode node : ctx.discovery().nodes(ses.getTopology())) { -- if (ctx.localNodeId().equals(node.id())) { -- ctx.job().masterLeaveLocal(ses.getId()); -- -- ctx.job().cancelJob(ses.getId(), null, false); -- } -- } -- -- return true; -- } -- -- return isCancelled(); -- } -- -- /** {@inheritDoc} */ -- @Override public String toString() { -- return S.toString(GridTaskFutureImpl.class, this, "super", super.toString()); - } - - /** - * - */ - private static class ComputeFuture<R> extends IgniteFutureImpl<R> implements ComputeTaskFuture<R> { - /** - * @param fut Future. - */ - private ComputeFuture(GridTaskFutureImpl<R> fut) { - super(fut); - } - - /** {@inheritDoc} */ - @Override public ComputeTaskSession getTaskSession() { - return ((GridTaskFutureImpl<R>)fut).getTaskSession(); - } -- } --} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aad27508/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskTimeoutCheckedException.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskTimeoutCheckedException.java index 0000000,0000000..6635640 new file mode 100644 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/compute/ComputeTaskTimeoutCheckedException.java @@@ -1,0 -1,0 +1,61 @@@ ++/* ++ * 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.internal.compute; ++ ++import org.apache.ignite.*; ++import org.jetbrains.annotations.*; ++ ++/** ++ * This exception indicates that task execution timed out. It is thrown from ++ * {@link org.apache.ignite.compute.ComputeTaskFuture#get()} method. ++ */ ++public class ComputeTaskTimeoutCheckedException extends IgniteCheckedException { ++ /** */ ++ private static final long serialVersionUID = 0L; ++ ++ /** ++ * Creates task timeout exception with given task execution ID and ++ * error message. ++ * ++ * @param msg Error message. ++ */ ++ public ComputeTaskTimeoutCheckedException(String msg) { ++ super(msg); ++ } ++ ++ /** ++ * Creates new task timeout exception given throwable as a cause and ++ * source of error message. ++ * ++ * @param cause Non-null throwable cause. ++ */ ++ public ComputeTaskTimeoutCheckedException(Throwable cause) { ++ this(cause.getMessage(), cause); ++ } ++ ++ /** ++ * Creates task timeout exception with given task execution ID, ++ * error message and optional nested exception. ++ * ++ * @param msg Error message. ++ * @param cause Optional nested exception (can be {@code null}). ++ */ ++ public ComputeTaskTimeoutCheckedException(String msg, @Nullable Throwable cause) { ++ super(msg, cause); ++ } ++} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aad27508/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsServer.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsServer.java index b5e7983,11dec82..9618ce2 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsServer.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsServer.java @@@ -388,10 -388,10 +388,10 @@@ public class GridGgfsServer } /** {@inheritDoc} */ - @Override protected void body() throws InterruptedException, IgniteInterruptedException { + @Override protected void body() throws InterruptedException, IgniteInterruptedCheckedException { try { while (!Thread.currentThread().isInterrupted()) { - GridIpcEndpoint client = srvEndpoint.accept(); + IpcEndpoint client = srvEndpoint.accept(); if (log.isDebugEnabled()) log.debug("GGFS client connected [ggfsName=" + ggfsCtx.kernalContext().gridName() + http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aad27508/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java ----------------------------------------------------------------------
