You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/01/20 10:16:42 UTC
[1/4] ignite git commit: ignite-1.5.4 Pass currently written message
class to MessageWriter. (cherry picked from commit 612bcb6)
Repository: ignite
Updated Branches:
refs/heads/ignite-gg-10837 85e22a278 -> c286fabb4
ignite-1.5.4 Pass currently written message class to MessageWriter.
(cherry picked from commit 612bcb6)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/09c1d5e4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/09c1d5e4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/09c1d5e4
Branch: refs/heads/ignite-gg-10837
Commit: 09c1d5e4ab4c8b6a68060806e3945a40df13f360
Parents: 6779145
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jan 19 15:30:53 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jan 19 15:46:57 2016 +0300
----------------------------------------------------------------------
.../internal/direct/DirectMessageWriter.java | 5 ++
.../stream/v1/DirectByteBufferStreamImplV1.java | 2 +
.../stream/v2/DirectByteBufferStreamImplV2.java | 2 +
.../continuous/CacheContinuousQueryEntry.java | 70 ++++++++++----------
.../continuous/AbstractContinuousMessage.java | 5 +-
.../ignite/internal/util/IgniteUtils.java | 3 +
.../ignite/internal/util/nio/GridNioServer.java | 12 ++++
.../ignite/lang/IgniteProductVersion.java | 18 +++++
.../extensions/communication/MessageWriter.java | 9 ++-
9 files changed, 89 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/09c1d5e4/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
index 730f9bc..b265c6c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/DirectMessageWriter.java
@@ -61,6 +61,11 @@ public class DirectMessageWriter implements MessageWriter {
}
/** {@inheritDoc} */
+ @Override public void setCurrentWriteClass(Class<? extends Message> msgCls) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
@Override public boolean writeHeader(byte type, byte fieldCnt) {
DirectByteBufferStream stream = state.item().stream;
http://git-wip-us.apache.org/repos/asf/ignite/blob/09c1d5e4/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java
index 5292f35..67fa9e7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v1/DirectByteBufferStreamImplV1.java
@@ -522,6 +522,8 @@ public class DirectByteBufferStreamImplV1 implements DirectByteBufferStream {
try {
writer.beforeInnerMessageWrite();
+ writer.setCurrentWriteClass(msg.getClass());
+
lastFinished = msg.writeTo(buf, writer);
}
finally {
http://git-wip-us.apache.org/repos/asf/ignite/blob/09c1d5e4/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
index ed3eb7c..1a4c4bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java
@@ -621,6 +621,8 @@ public class DirectByteBufferStreamImplV2 implements DirectByteBufferStream {
try {
writer.beforeInnerMessageWrite();
+ writer.setCurrentWriteClass(msg.getClass());
+
lastFinished = msg.writeTo(buf, writer);
}
finally {
http://git-wip-us.apache.org/repos/asf/ignite/blob/09c1d5e4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
index bcc2576..4d3786a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEntry.java
@@ -84,17 +84,17 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
private GridDeploymentInfo depInfo;
/** Partition. */
- private int _part;
+ private int part;
/** Update counter. */
- private long _updateCntr;
+ private long updateCntr;
/** Flags. */
private byte flags;
/** */
@GridToStringInclude
- private AffinityTopologyVersion _topVer;
+ private AffinityTopologyVersion topVer;
/** Filtered events. */
private GridLongList filteredEvts;
@@ -134,9 +134,9 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
this.key = key;
this.newVal = newVal;
this.oldVal = oldVal;
- this._part = part;
- this._updateCntr = updateCntr;
- this._topVer = topVer;
+ this.part = part;
+ this.updateCntr = updateCntr;
+ this.topVer = topVer;
this.keepBinary = keepBinary;
}
@@ -144,7 +144,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
* @return Topology version if applicable.
*/
@Nullable AffinityTopologyVersion topologyVersion() {
- return _topVer;
+ return topVer;
}
/**
@@ -165,14 +165,14 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
* @return Partition.
*/
int partition() {
- return _part;
+ return part;
}
/**
* @return Update counter.
*/
long updateCounter() {
- return _updateCntr;
+ return updateCntr;
}
/**
@@ -310,67 +310,67 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
switch (writer.state()) {
case 0:
- if (!writer.writeInt("_part", _part))
+ if (!writer.writeInt("cacheId", cacheId))
return false;
writer.incrementState();
case 1:
- if (!writer.writeMessage("_topVer", _topVer))
+ if (!writer.writeByte("evtType", evtType != null ? (byte)evtType.ordinal() : -1))
return false;
writer.incrementState();
case 2:
- if (!writer.writeLong("_updateCntr", _updateCntr))
+ if (!writer.writeMessage("filteredEvts", filteredEvts))
return false;
writer.incrementState();
case 3:
- if (!writer.writeInt("cacheId", cacheId))
+ if (!writer.writeByte("flags", flags))
return false;
writer.incrementState();
case 4:
- if (!writer.writeByte("evtType", evtType != null ? (byte)evtType.ordinal() : -1))
+ if (!writer.writeBoolean("keepBinary", keepBinary))
return false;
writer.incrementState();
case 5:
- if (!writer.writeMessage("filteredEvts", filteredEvts))
+ if (!writer.writeMessage("key", key))
return false;
writer.incrementState();
case 6:
- if (!writer.writeByte("flags", flags))
+ if (!writer.writeMessage("newVal", newVal))
return false;
writer.incrementState();
case 7:
- if (!writer.writeBoolean("keepBinary", keepBinary))
+ if (!writer.writeMessage("oldVal", oldVal))
return false;
writer.incrementState();
case 8:
- if (!writer.writeMessage("key", key))
+ if (!writer.writeInt("part", part))
return false;
writer.incrementState();
case 9:
- if (!writer.writeMessage("newVal", newVal))
+ if (!writer.writeMessage("topVer", topVer))
return false;
writer.incrementState();
case 10:
- if (!writer.writeMessage("oldVal", oldVal))
+ if (!writer.writeLong("updateCntr", updateCntr))
return false;
writer.incrementState();
@@ -389,7 +389,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
switch (reader.state()) {
case 0:
- _part = reader.readInt("_part");
+ cacheId = reader.readInt("cacheId");
if (!reader.isLastRead())
return false;
@@ -397,15 +397,19 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
reader.incrementState();
case 1:
- _topVer = reader.readMessage("_topVer");
+ byte evtTypeOrd;
+
+ evtTypeOrd = reader.readByte("evtType");
if (!reader.isLastRead())
return false;
+ evtType = eventTypeFromOrdinal(evtTypeOrd);
+
reader.incrementState();
case 2:
- _updateCntr = reader.readLong("_updateCntr");
+ filteredEvts = reader.readMessage("filteredEvts");
if (!reader.isLastRead())
return false;
@@ -413,7 +417,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
reader.incrementState();
case 3:
- cacheId = reader.readInt("cacheId");
+ flags = reader.readByte("flags");
if (!reader.isLastRead())
return false;
@@ -421,19 +425,15 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
reader.incrementState();
case 4:
- byte evtTypeOrd;
-
- evtTypeOrd = reader.readByte("evtType");
+ keepBinary = reader.readBoolean("keepBinary");
if (!reader.isLastRead())
return false;
- evtType = eventTypeFromOrdinal(evtTypeOrd);
-
reader.incrementState();
case 5:
- filteredEvts = reader.readMessage("filteredEvts");
+ key = reader.readMessage("key");
if (!reader.isLastRead())
return false;
@@ -441,7 +441,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
reader.incrementState();
case 6:
- flags = reader.readByte("flags");
+ newVal = reader.readMessage("newVal");
if (!reader.isLastRead())
return false;
@@ -449,7 +449,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
reader.incrementState();
case 7:
- keepBinary = reader.readBoolean("keepBinary");
+ oldVal = reader.readMessage("oldVal");
if (!reader.isLastRead())
return false;
@@ -457,7 +457,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
reader.incrementState();
case 8:
- key = reader.readMessage("key");
+ part = reader.readInt("part");
if (!reader.isLastRead())
return false;
@@ -465,7 +465,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
reader.incrementState();
case 9:
- newVal = reader.readMessage("newVal");
+ topVer = reader.readMessage("topVer");
if (!reader.isLastRead())
return false;
@@ -473,7 +473,7 @@ public class CacheContinuousQueryEntry implements GridCacheDeployable, Message {
reader.incrementState();
case 10:
- oldVal = reader.readMessage("oldVal");
+ updateCntr = reader.readLong("updateCntr");
if (!reader.isLastRead())
return false;
http://git-wip-us.apache.org/repos/asf/ignite/blob/09c1d5e4/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
index 8aa683e..01a95df 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/AbstractContinuousMessage.java
@@ -25,6 +25,9 @@ import org.apache.ignite.lang.IgniteUuid;
*
*/
public abstract class AbstractContinuousMessage implements DiscoveryCustomMessage {
+ /** */
+ private static final long serialVersionUID = 2781778657738703012L;
+
/** Routine ID. */
protected final UUID routineId;
@@ -54,4 +57,4 @@ public abstract class AbstractContinuousMessage implements DiscoveryCustomMessag
@Override public boolean isMutable() {
return false;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/09c1d5e4/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 6a7145c..0bf937d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -9323,6 +9323,9 @@ public abstract class IgniteUtils {
assert buf != null;
assert buf.hasArray();
+ if (writer != null)
+ writer.setCurrentWriteClass(msg.getClass());
+
boolean finished = false;
int cnt = 0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/09c1d5e4/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index c366fe3..84c8157 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -1001,6 +1001,9 @@ public class GridNioServer<T> {
assert msg != null;
+ if (writer != null)
+ writer.setCurrentWriteClass(msg.getClass());
+
finished = msg.writeTo(buf, writer);
if (finished && writer != null)
@@ -1023,6 +1026,9 @@ public class GridNioServer<T> {
assert msg != null;
+ if (writer != null)
+ writer.setCurrentWriteClass(msg.getClass());
+
finished = msg.writeTo(buf, writer);
if (finished && writer != null)
@@ -1169,6 +1175,9 @@ public class GridNioServer<T> {
assert msg != null;
+ if (writer != null)
+ writer.setCurrentWriteClass(msg.getClass());
+
finished = msg.writeTo(buf, writer);
if (finished && writer != null)
@@ -1193,6 +1202,9 @@ public class GridNioServer<T> {
assert msg != null;
+ if (writer != null)
+ writer.setCurrentWriteClass(msg.getClass());
+
finished = msg.writeTo(buf, writer);
if (finished && writer != null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/09c1d5e4/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java b/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java
index 12851ba..0abe64f 100644
--- a/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/lang/IgniteProductVersion.java
@@ -197,6 +197,24 @@ public class IgniteProductVersion implements Comparable<IgniteProductVersion>, E
return Long.compare(revTs, o.revTs);
}
+ /**
+ * @param o Other version.
+ * @return Compare result.
+ */
+ public int compareToIgnoreTimestamp(@NotNull IgniteProductVersion o) {
+ int res = Integer.compare(major, o.major);
+
+ if (res != 0)
+ return res;
+
+ res = Integer.compare(minor, o.minor);
+
+ if (res != 0)
+ return res;
+
+ return Integer.compare(maintenance, o.maintenance);
+ }
+
/** {@inheritDoc} */
@Override public boolean equals(Object o) {
if (this == o)
http://git-wip-us.apache.org/repos/asf/ignite/blob/09c1d5e4/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
index 2fef564..bc2478b 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/extensions/communication/MessageWriter.java
@@ -38,6 +38,13 @@ public interface MessageWriter {
public void setBuffer(ByteBuffer buf);
/**
+ * Sets type of message currently written.
+ *
+ * @param msgCls Message type.
+ */
+ public void setCurrentWriteClass(Class<? extends Message> msgCls);
+
+ /**
* Writes message header.
*
* @param type Message type.
@@ -315,4 +322,4 @@ public interface MessageWriter {
* Resets this writer.
*/
public void reset();
-}
\ No newline at end of file
+}
[2/4] ignite git commit: IGNITE-944: HTTP REST log command doesn't
work. This closes #383
Posted by sb...@apache.org.
IGNITE-944: HTTP REST log command doesn't work. This closes #383
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/05677038
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/05677038
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/05677038
Branch: refs/heads/ignite-gg-10837
Commit: 0567703827b7c8415c3e840b37e81a1ce8dbfc29
Parents: 2d10630
Author: Saikat Maitra <sa...@gmail.com>
Authored: Wed Jan 20 11:07:09 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed Jan 20 11:07:09 2016 +0300
----------------------------------------------------------------------
modules/core/pom.xml | 3 +
.../processors/rest/GridRestProcessor.java | 3 +
.../handlers/log/GridLogCommandHandler.java | 176 +++++++++++++++++++
.../rest/request/GridRestLogRequest.java | 10 +-
.../handlers/log/GridLogCommandHandlerTest.java | 146 +++++++++++++++
.../testsuites/IgniteRestHandlerTestSuite.java | 4 +-
6 files changed, 340 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/05677038/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index b07a754..bdf822b 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -229,6 +229,9 @@
<exclude>**/*.java</exclude>
</excludes>
</testResource>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
</testResources>
<plugins>
http://git-wip-us.apache.org/repos/asf/ignite/blob/05677038/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
index e839443..6d20547 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
@@ -44,6 +44,7 @@ import org.apache.ignite.internal.processors.rest.client.message.GridClientTaskR
import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandler;
import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandler;
import org.apache.ignite.internal.processors.rest.handlers.datastructures.DataStructuresCommandHandler;
+import org.apache.ignite.internal.processors.rest.handlers.log.GridLogCommandHandler;
import org.apache.ignite.internal.processors.rest.handlers.query.QueryCommandHandler;
import org.apache.ignite.internal.processors.rest.handlers.task.GridTaskCommandHandler;
import org.apache.ignite.internal.processors.rest.handlers.top.GridTopologyCommandHandler;
@@ -442,6 +443,8 @@ public class GridRestProcessor extends GridProcessorAdapter {
addHandler(new GridVersionCommandHandler(ctx));
addHandler(new DataStructuresCommandHandler(ctx));
addHandler(new QueryCommandHandler(ctx));
+ addHandler(new GridLogCommandHandler(ctx));
+
// Start protocols.
startTcpProtocol();
http://git-wip-us.apache.org/repos/asf/ignite/blob/05677038/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java
new file mode 100644
index 0000000..2f8529d
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandler.java
@@ -0,0 +1,176 @@
+/*
+ * 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.processors.rest.handlers.log;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.net.URI;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Collection;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.rest.GridRestCommand;
+import org.apache.ignite.internal.processors.rest.GridRestResponse;
+import org.apache.ignite.internal.processors.rest.handlers.GridRestCommandHandlerAdapter;
+import org.apache.ignite.internal.processors.rest.request.GridRestLogRequest;
+import org.apache.ignite.internal.processors.rest.request.GridRestRequest;
+import org.apache.ignite.internal.util.future.GridFinishedFuture;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
+import static org.apache.ignite.internal.processors.rest.GridRestCommand.LOG;
+
+/**
+ * Handler for {@link org.apache.ignite.internal.processors.rest.GridRestCommand#LOG} command.
+ */
+public class GridLogCommandHandler extends GridRestCommandHandlerAdapter {
+ /**
+ * Supported commands.
+ */
+ private static final Collection<GridRestCommand> SUPPORTED_COMMANDS = U.sealList(LOG);
+
+ /**
+ * Default log file name *
+ */
+ private static final String DEFAULT_LOG_PATH = "work/log/ignite.log";
+
+ /**
+ * Default log file start line number *
+ */
+ private static final int DEFAULT_FROM = 0;
+
+ /**
+ * Default log file end line number*
+ */
+ private static final int DEFAULT_TO = 1;
+
+ /**
+ * @param ctx Context.
+ */
+ public GridLogCommandHandler(GridKernalContext ctx) {
+ super(ctx);
+ }
+
+ /** {@inheritDoc} */
+ @Override public Collection<GridRestCommand> supportedCommands() {
+ return SUPPORTED_COMMANDS;
+ }
+
+ /** {@inheritDoc} */
+ @Override public IgniteInternalFuture<GridRestResponse> handleAsync(GridRestRequest req) {
+ assert req != null;
+
+ if (req.command() == LOG) {
+ if (log.isDebugEnabled())
+ log.debug("Handling log REST request: " + req);
+
+ GridRestLogRequest req0 = (GridRestLogRequest)req;
+
+ if (req0.from() < -1 || req0.to() < -1)
+ return new GridFinishedFuture<>(new GridRestResponse(GridRestResponse.STATUS_FAILED,
+ "One of the request parameters is invalid [from=" + req0.from() + ", to=" + req0.to() + ']'));
+
+ int from;
+
+ if (req0.from() != -1) {
+ if (req0.to() == -1)
+ return new GridFinishedFuture<>(new GridRestResponse(GridRestResponse.STATUS_FAILED,
+ "Request parameter 'to' is not set."));
+
+ from = req0.from();
+ }
+ else
+ from = DEFAULT_FROM;
+
+
+ int to;
+
+ if (req0.to() != -1) {
+ if (req0.from() == -1)
+ return new GridFinishedFuture<>(new GridRestResponse(GridRestResponse.STATUS_FAILED,
+ "Request parameter 'from' is not set."));
+
+ to = req0.to();
+ }
+ else
+ to = DEFAULT_TO;
+
+ if (from >= to)
+ return new GridFinishedFuture<>(new GridRestResponse(GridRestResponse.STATUS_FAILED,
+ "Request parameter 'from' must be less than 'to'."));
+
+ File logFile;
+
+ try {
+ if (req0.path() != null)
+ logFile = new File(req0.path());
+ else
+ logFile = new File(ctx.config().getIgniteHome() + "/" + DEFAULT_LOG_PATH);
+ }
+ catch (InvalidPathException e) {
+ return new GridFinishedFuture<>(new GridRestResponse(GridRestResponse.STATUS_FAILED,
+ "Incorrect path to a log file [msg=" + e.getMessage() + ']'));
+ }
+
+ try {
+ String content = readLog(from, to, logFile);
+
+ return new GridFinishedFuture<>(new GridRestResponse(content));
+ }
+ catch (IgniteCheckedException e) {
+ return new GridFinishedFuture<>(new GridRestResponse(GridRestResponse.STATUS_FAILED, e.getMessage()));
+ }
+ }
+
+ return new GridFinishedFuture<>();
+ }
+
+ /**
+ * Reads content from a log file.
+ *
+ * @param from Start position.
+ * @param to End position.
+ * @param logFile Log file.
+ * @return Content that is read.
+ * @throws IgniteCheckedException If failed.
+ */
+ private String readLog(int from, int to, File logFile) throws IgniteCheckedException {
+ StringBuilder content = new StringBuilder();
+
+ try (BufferedReader reader = new BufferedReader(new FileReader(logFile))) {
+ String line;
+
+ while (from <= to && (line = reader.readLine()) != null) {
+ content.append(line);
+
+ from++;
+ }
+ }
+ catch (IOException e) {
+ throw new IgniteCheckedException(e);
+ }
+
+ return content.toString();
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/05677038/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestLogRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestLogRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestLogRequest.java
index 38a9a81..944d641 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestLogRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/request/GridRestLogRequest.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.rest.request;
+import org.apache.ignite.internal.processors.rest.GridRestCommand;
import org.apache.ignite.internal.util.typedef.internal.S;
/**
@@ -33,6 +34,13 @@ public class GridRestLogRequest extends GridRestRequest {
private int to = -1;
/**
+ * Constructor.
+ */
+ public GridRestLogRequest() {
+ command(GridRestCommand.LOG);
+ }
+
+ /**
* @return Path to log file.
*/
public String path() {
@@ -78,4 +86,4 @@ public class GridRestLogRequest extends GridRestRequest {
@Override public String toString() {
return S.toString(GridRestLogRequest.class, this, super.toString());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/05677038/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java
new file mode 100644
index 0000000..cc673fb
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java
@@ -0,0 +1,146 @@
+/*
+ * 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.processors.rest.handlers.log;
+
+import java.util.Collection;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.rest.GridRestCommand;
+import org.apache.ignite.internal.processors.rest.GridRestResponse;
+import org.apache.ignite.internal.processors.rest.request.GridRestLogRequest;
+import org.apache.ignite.testframework.junits.GridTestKernalContext;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ * REST log command handler tests.
+ */
+public class GridLogCommandHandlerTest extends GridCommonAbstractTest {
+ /**
+ * @throws Exception If failed.
+ */
+ public void testSupportedCommands() throws Exception {
+ GridLogCommandHandler cmdHandler = new GridLogCommandHandler(newContext());
+
+ Collection<GridRestCommand> commands = cmdHandler.supportedCommands();
+
+ assertEquals(1, commands.size());
+ assertTrue(commands.contains(GridRestCommand.LOG));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testUnSupportedCommands() throws Exception {
+ GridLogCommandHandler cmdHandler = new GridLogCommandHandler(newContext());
+
+ Collection<GridRestCommand> commands = cmdHandler.supportedCommands();
+
+ assertEquals(1, commands.size());
+ assertFalse(commands.contains(GridRestCommand.VERSION));
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testHandleAsync() throws Exception {
+ GridLogCommandHandler cmdHandler = new GridLogCommandHandler(newContext());
+ GridRestLogRequest req = new GridRestLogRequest();
+
+ req.to(5);
+ req.from(2);
+
+ req.path(getClass().getResource("/test.log").getFile());
+
+ IgniteInternalFuture<GridRestResponse> resp = cmdHandler.handleAsync(req);
+
+ assertNull(resp.result().getError());
+ assertEquals(GridRestResponse.STATUS_SUCCESS, resp.result().getSuccessStatus());
+ assertNotNull(resp.result().getResponse());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testHandleAsyncFromAndToNotSet() throws Exception {
+ GridLogCommandHandler cmdHandler = new GridLogCommandHandler(newContext());
+ GridRestLogRequest req = new GridRestLogRequest();
+
+ req.path(getClass().getResource("/test.log").getFile());
+
+ IgniteInternalFuture<GridRestResponse> resp = cmdHandler.handleAsync(req);
+
+ assertNull(resp.result().getError());
+ assertEquals(GridRestResponse.STATUS_SUCCESS, resp.result().getSuccessStatus());
+ assertNotNull(resp.result().getResponse());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testHandleAsyncPathNotSet() throws Exception {
+ GridTestKernalContext ctx = newContext();
+ ctx.config().setIgniteHome(getClass().getResource("/").getFile());
+
+ GridLogCommandHandler cmdHandler = new GridLogCommandHandler(ctx);
+ GridRestLogRequest req = new GridRestLogRequest();
+
+ req.to(5);
+ req.from(2);
+
+ IgniteInternalFuture<GridRestResponse> resp = cmdHandler.handleAsync(req);
+
+ assertNull(resp.result().getError());
+ assertEquals(GridRestResponse.STATUS_SUCCESS, resp.result().getSuccessStatus());
+ assertNotNull(resp.result().getResponse());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testHandleAsyncFromGreaterThanTo() throws Exception {
+ GridLogCommandHandler cmdHandler = new GridLogCommandHandler(newContext());
+ GridRestLogRequest req = new GridRestLogRequest();
+
+ req.to(2);
+ req.from(5);
+ req.path(getClass().getResource("/test.log").getFile());
+
+
+ IgniteInternalFuture<GridRestResponse> resp = cmdHandler.handleAsync(req);
+
+ assertEquals("Request parameter 'from' must be less than 'to'.", resp.result().getError());
+ assertEquals(GridRestResponse.STATUS_FAILED, resp.result().getSuccessStatus());
+ assertNull(resp.result().getResponse());
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testHandleAsyncFromEqualTo() throws Exception {
+ GridLogCommandHandler cmdHandler = new GridLogCommandHandler(newContext());
+ GridRestLogRequest req = new GridRestLogRequest();
+
+ req.to(2);
+ req.from(2);
+ req.path(getClass().getResource("/test.log").getFile());
+
+ IgniteInternalFuture<GridRestResponse> resp = cmdHandler.handleAsync(req);
+
+ assertEquals("Request parameter 'from' must be less than 'to'.", resp.result().getError());
+ assertEquals(GridRestResponse.STATUS_FAILED, resp.result().getSuccessStatus());
+ assertNull(resp.result().getResponse());
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/05677038/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteRestHandlerTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteRestHandlerTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteRestHandlerTestSuite.java
index 73a2c1b..d5de376 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteRestHandlerTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteRestHandlerTestSuite.java
@@ -19,6 +19,7 @@ package org.apache.ignite.testsuites;
import junit.framework.TestSuite;
import org.apache.ignite.internal.processors.rest.handlers.cache.GridCacheCommandHandlerSelfTest;
+import org.apache.ignite.internal.processors.rest.handlers.log.GridLogCommandHandlerTest;
/**
* REST support tests.
@@ -32,7 +33,8 @@ public class IgniteRestHandlerTestSuite extends TestSuite {
TestSuite suite = new TestSuite("REST Support Test Suite");
suite.addTestSuite(GridCacheCommandHandlerSelfTest.class);
+ suite.addTestSuite(GridLogCommandHandlerTest.class);
return suite;
}
-}
\ No newline at end of file
+}
[3/4] ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/ignite into master-main
Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into master-main
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1c2081d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1c2081d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1c2081d
Branch: refs/heads/ignite-gg-10837
Commit: c1c2081dfea07cb19dd4711c71b6cce249bd559d
Parents: 0567703 09c1d5e
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed Jan 20 11:07:48 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed Jan 20 11:07:48 2016 +0300
----------------------------------------------------------------------
.../internal/GridEventConsumeHandler.java | 3 +-
.../internal/GridMessageListenHandler.java | 6 +-
.../internal/binary/BinaryClassDescriptor.java | 15 +-
.../internal/binary/BinaryEnumObjectImpl.java | 3 +-
.../ignite/internal/binary/BinaryUtils.java | 78 ++++
.../internal/direct/DirectMessageReader.java | 11 +
.../internal/direct/DirectMessageWriter.java | 18 +
.../direct/state/DirectMessageState.java | 10 +
.../stream/v1/DirectByteBufferStreamImplV1.java | 10 +
.../stream/v2/DirectByteBufferStreamImplV2.java | 10 +
.../managers/discovery/CustomEventListener.java | 4 +-
.../discovery/DiscoveryCustomMessage.java | 9 -
.../discovery/GridDiscoveryManager.java | 35 +-
.../processors/cache/CacheObjectContext.java | 91 ++--
.../cache/DynamicCacheChangeBatch.java | 5 -
.../processors/cache/GridCacheAdapter.java | 30 +-
.../processors/cache/GridCacheContext.java | 33 ++
.../processors/cache/GridCacheProcessor.java | 42 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 33 +-
.../dht/CacheDistributedGetFutureAdapter.java | 28 +-
.../dht/GridClientPartitionTopology.java | 2 +
.../dht/GridDhtPartitionTopologyImpl.java | 27 +-
.../dht/GridPartitionedGetFuture.java | 241 ++++++-----
.../dht/GridPartitionedSingleGetFuture.java | 229 ++++++----
.../dht/atomic/GridDhtAtomicCache.java | 26 ++
.../colocated/GridDhtColocatedLockFuture.java | 4 -
.../dht/preloader/GridDhtPartitionDemander.java | 11 +-
.../GridDhtPartitionsExchangeFuture.java | 8 +-
.../distributed/near/GridNearGetFuture.java | 267 +++++++-----
.../continuous/CacheContinuousQueryHandler.java | 36 +-
.../cache/transactions/IgniteTxManager.java | 18 +-
.../continuous/AbstractContinuousMessage.java | 10 +-
.../continuous/GridContinuousHandler.java | 4 +-
.../continuous/GridContinuousProcessor.java | 26 +-
.../internal/processors/igfs/IgfsProcessor.java | 3 -
.../platform/PlatformAbstractTarget.java | 28 +-
.../platform/PlatformNoopProcessor.java | 5 +
.../processors/platform/PlatformProcessor.java | 8 +
.../platform/PlatformProcessorImpl.java | 5 +
.../platform/cache/PlatformCache.java | 6 +-
.../platform/compute/PlatformCompute.java | 132 +++++-
.../dotnet/PlatformDotNetCacheStore.java | 33 +-
.../platform/events/PlatformEvents.java | 16 +-
.../platform/messaging/PlatformMessaging.java | 7 +-
.../platform/services/PlatformServices.java | 14 +-
.../ignite/internal/util/IgniteUtils.java | 3 +
.../internal/util/nio/GridDirectParser.java | 52 ++-
.../ignite/internal/util/nio/GridNioServer.java | 12 +
.../ignite/lang/IgniteProductVersion.java | 18 +
.../extensions/communication/MessageWriter.java | 9 +-
.../communication/tcp/TcpCommunicationSpi.java | 9 +-
.../tcp/ipfinder/TcpDiscoveryIpFinder.java | 14 +-
.../ipfinder/jdbc/TcpDiscoveryJdbcIpFinder.java | 48 ++-
.../internal/TestRecordingCommunicationSpi.java | 157 +++++++
.../binary/BinaryMarshallerSelfTest.java | 44 +-
...idCacheConfigurationConsistencySelfTest.java | 58 +--
.../cache/GridCacheDeploymentSelfTest.java | 3 +-
...IgniteCacheGetCustomCollectionsSelfTest.java | 128 ++++++
...gniteCacheLoadRebalanceEvictionSelfTest.java | 188 ++++++++
.../cache/IgniteCacheNearLockValueSelfTest.java | 62 +--
.../cache/IgniteCacheStoreCollectionTest.java | 12 +
...eDynamicCacheStartNoExchangeTimeoutTest.java | 7 +
...niteDynamicCacheStartStopConcurrentTest.java | 119 ++++++
...ridCachePartitionNotLoadedEventSelfTest.java | 7 +-
.../IgniteCacheAtomicNodeRestartTest.java | 2 +
...niteCacheClientNodeChangingTopologyTest.java | 4 +-
.../distributed/IgniteCacheGetRestartTest.java | 280 ++++++++++++
.../IgniteCacheReadFromBackupTest.java | 427 +++++++++++++++++++
.../IgniteCacheSingleGetMessageTest.java | 88 +---
.../IgniteCrossCacheTxStoreSelfTest.java | 1 +
.../GridCacheDhtPreloadMessageCountTest.java | 62 +--
.../near/GridCacheGetStoreErrorSelfTest.java | 9 +-
.../GridCachePartitionedNodeRestartTest.java | 4 +-
...ePartitionedOptimisticTxNodeRestartTest.java | 4 +-
...ContinuousQueryFailoverAbstractSelfTest.java | 80 ++++
.../CacheContinuousQueryLostPartitionTest.java | 256 +++++++++++
.../IgniteServiceDynamicCachesSelfTest.java | 183 ++++++++
.../platform/PlatformComputeBroadcastTask.java | 7 +
.../platform/PlatformComputeEchoTask.java | 6 +-
...CommunicationRecoveryAckClosureSelfTest.java | 2 +
.../ignite/testframework/GridTestUtils.java | 27 ++
.../IgniteCacheRestartTestSuite2.java | 3 +
.../testsuites/IgniteCacheTestSuite4.java | 9 +
.../testsuites/IgniteCacheTestSuite5.java | 2 +
.../hadoop/fs/BasicHadoopFileSystemFactory.java | 19 +-
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 6 +-
.../hadoop/fs/v1/IgniteHadoopFileSystem.java | 7 +-
.../hadoop/fs/v2/IgniteHadoopFileSystem.java | 7 +
...niteCacheP2pUnmarshallingQueryErrorTest.java | 18 +-
.../IgniteBinaryCacheQueryTestSuite.java | 2 +
.../cpp/common/include/ignite/common/exports.h | 1 +
.../cpp/common/include/ignite/common/java.h | 3 +
.../platforms/cpp/common/project/vs/module.def | 3 +-
modules/platforms/cpp/common/src/exports.cpp | 4 +
modules/platforms/cpp/common/src/java.cpp | 20 +
.../Apache.Ignite.Core.Tests.csproj | 1 +
.../Binary/BinaryBuilderSelfTest.cs | 8 +-
.../Cache/CacheAbstractTest.cs | 19 +
.../Compute/CancellationTest.cs | 174 ++++++++
.../Compute/ComputeApiTest.cs | 2 +-
.../Apache.Ignite.Core/Binary/IBinaryObject.cs | 8 +
.../Common/IgniteFutureCancelledException.cs | 1 +
.../dotnet/Apache.Ignite.Core/IIgnite.cs | 7 +
.../Apache.Ignite.Core/Impl/Binary/Binary.cs | 3 +
.../Impl/Binary/BinaryEnum.cs | 6 +
.../Impl/Binary/BinaryObject.cs | 6 +
.../Impl/Cache/Store/CacheStore.cs | 9 +-
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 6 +
.../Apache.Ignite.Core/Impl/IgniteProxy.cs | 6 +
.../Impl/Unmanaged/IgniteJniNativeMethods.cs | 3 +
.../Impl/Unmanaged/UnmanagedUtils.cs | 22 +-
.../Services/ServicesExample.cs | 2 +-
modules/storm/README.txt | 37 ++
modules/storm/licenses/apache-2.0.txt | 202 +++++++++
modules/storm/pom.xml | 104 +++++
.../ignite/stream/storm/StormStreamer.java | 304 +++++++++++++
.../ignite/stream/storm/package-info.java | 22 +
.../storm/IgniteStormStreamerSelfTestSuite.java | 38 ++
.../storm/StormIgniteStreamerSelfTest.java | 184 ++++++++
.../ignite/stream/storm/TestStormSpout.java | 141 ++++++
.../storm/src/test/resources/example-ignite.xml | 71 +++
.../yardstick/cache/IgniteGetTxBenchmark.java | 30 ++
pom.xml | 1 +
123 files changed, 4669 insertions(+), 884 deletions(-)
----------------------------------------------------------------------
[4/4] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-gg-10837
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-gg-10837
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c286fabb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c286fabb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c286fabb
Branch: refs/heads/ignite-gg-10837
Commit: c286fabb41f1de7ac018fe2af2dde35586a13769
Parents: 85e22a2 c1c2081
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jan 20 12:15:35 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jan 20 12:15:35 2016 +0300
----------------------------------------------------------------------
modules/core/pom.xml | 3 +
.../internal/direct/DirectMessageWriter.java | 5 +
.../stream/v1/DirectByteBufferStreamImplV1.java | 2 +
.../stream/v2/DirectByteBufferStreamImplV2.java | 2 +
.../continuous/CacheContinuousQueryEntry.java | 70 ++++----
.../continuous/AbstractContinuousMessage.java | 5 +-
.../processors/rest/GridRestProcessor.java | 3 +
.../handlers/log/GridLogCommandHandler.java | 176 +++++++++++++++++++
.../rest/request/GridRestLogRequest.java | 10 +-
.../ignite/internal/util/IgniteUtils.java | 3 +
.../ignite/internal/util/nio/GridNioServer.java | 12 ++
.../ignite/lang/IgniteProductVersion.java | 18 ++
.../extensions/communication/MessageWriter.java | 9 +-
.../handlers/log/GridLogCommandHandlerTest.java | 146 +++++++++++++++
.../testsuites/IgniteRestHandlerTestSuite.java | 4 +-
15 files changed, 429 insertions(+), 39 deletions(-)
----------------------------------------------------------------------