[ignite] branch master updated: IGNITE-19160 Improve log message about sent partition file during snapshot restore (#10871)

[na...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

namelchev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new eda46a28fd1 IGNITE-19160 Improve log message about sent partition file during snapshot restore (#10871)
eda46a28fd1 is described below

commit eda46a28fd120e1998982bcf47671689c2fce4c1
Author: Julia Bakulina <96...@users.noreply.github.com>
AuthorDate: Wed Aug 9 10:50:40 2023 +0300

    IGNITE-19160 Improve log message about sent partition file during snapshot restore (#10871)
---
 .../ignite/internal/managers/communication/GridIoManager.java     | 8 ++++----
 .../cache/persistence/snapshot/IgniteSnapshotManager.java         | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 4433000c34c..7a0bfeab391 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -3219,7 +3219,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
         private T2<UUID, IgniteUuid> sesKey;
 
         /** Instance of opened writable channel to work with. */
-        private WritableByteChannel channel;
+        private SocketChannel channel;
 
         /** Decorated with data operations socket of output channel. */
         private ObjectOutput out;
@@ -3253,7 +3253,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
 
             configureChannel(channel, netTimeoutMs);
 
-            this.channel = (WritableByteChannel)channel;
+            this.channel = channel;
             out = new ObjectOutputStream(channel.socket().getOutputStream());
             in = new ObjectInputStream(channel.socket().getInputStream());
 
@@ -3382,8 +3382,8 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
 
                 U.log(log, "File has been sent to remote node [name=" + file.getName() +
                     ", uploadTime=" + (double)((U.currentTimeMillis() - startTime) / 1000) + " sec, retries=" + retries +
-                    ", transferred=" + snd.transferred() + ", rmtId=" + rmtId + ']');
-
+                    ", transferred=" + snd.transferred() + ", rmtId=" + rmtId +
+                    ", rmtAddr=" + channel.getRemoteAddress() + ']');
             }
             catch (InterruptedException e) {
                 closeChannelQuiet();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
index 58efd68bff2..e9636db1500 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
@@ -224,6 +224,7 @@ import static org.apache.ignite.internal.processors.cache.binary.CacheObjectBina
 import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.INDEX_FILE_NAME;
 import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.PART_FILE_TEMPLATE;
 import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.cacheDirectories;
+import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.cacheGroupName;
 import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.getPartitionFile;
 import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.getPartitionFileName;
 import static org.apache.ignite.internal.processors.cache.persistence.filename.PdsFolderResolver.DB_DEFAULT_FOLDER;
@@ -3997,8 +3998,8 @@ public class IgniteSnapshotManager extends GridCacheSharedManagerAdapter
                 sndr.send(part, 0, len, transmissionParams(rqId, cacheDirName, pair), TransmissionPolicy.FILE);
 
                 if (log.isInfoEnabled()) {
-                    log.info("Partition file has been send [part=" + part.getName() + ", pair=" + pair +
-                        ", length=" + len + ']');
+                    log.info("Partition file has been sent [part=" + part.getName() + ", pair=" + pair +
+                        ", grpName=" + cacheGroupName(new File(cacheDirName)) + ", length=" + len + ']');
                 }
             }
             catch (TransmissionCancelledException e) {