From c66889a45ae2b38d03fd06e3f437b551bd7906ab Mon Sep 17 00:00:00 2001 From: Alexandr Kuramshin Date: Mon, 27 Mar 2017 17:16:22 +0700 Subject: [PATCH] IGNITE-4865 Verbose logging, informative messages --- .../optimized/GridClientOptimizedMarshaller.java | 6 ++++-- .../apache/ignite/internal/util/nio/GridNioServer.java | 10 ++-------- .../marshaller/optimized/OptimizedMarshallerUtils.java | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) mode change 100644 => 100755 modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java mode change 100644 => 100755 modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java mode change 100644 => 100755 modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java old mode 100644 new mode 100755 index 3c65db6b73ab4..0cfc05235b894 --- a/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/client/marshaller/optimized/GridClientOptimizedMarshaller.java @@ -129,12 +129,14 @@ public ClientMarshallerContext(@Nullable List plugins) { /** {@inheritDoc} */ @Override protected boolean registerClassName(int id, String clsName) { - throw new UnsupportedOperationException(clsName); + throw new UnsupportedOperationException("Registering classes is not supported with " + + "GridClientOptimizedMarshaller (use 'classnames.properties'), clsName=" + clsName); } /** {@inheritDoc} */ @Override protected String className(int id) { - throw new UnsupportedOperationException(); + throw new UnsupportedOperationException("Resolving classes is not supported with " + + "GridClientOptimizedMarshaller (use 'classnames.properties')"); } } } 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 old mode 100644 new mode 100755 index a59adba9d16e7..caf6afe4e2850 --- 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 @@ -2217,14 +2217,8 @@ private void register(NioOperationFuture req) { * @return {@code True} if this call closed the ses. */ protected boolean close(final GridSelectorNioSessionImpl ses, @Nullable final IgniteCheckedException e) { - if (e != null) { - // Print stack trace only if has runtime exception in it's cause. - if (e.hasCause(IOException.class)) - U.warn(log, "Closing NIO session because of unhandled exception [cls=" + e.getClass() + - ", msg=" + e.getMessage() + ']'); - else - U.error(log, "Closing NIO session because of unhandled exception.", e); - } + if (e != null) + U.error(log, "Closing NIO session because of unhandled exception.", e); sessions.remove(ses); workerSessions.remove(ses); diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java old mode 100644 new mode 100755 index 849afa5b81109..a2748398e20d3 --- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerUtils.java @@ -265,7 +265,7 @@ static OptimizedClassDescriptor classDescriptor( try { cls = ctx.getClass(id, ldr); } - catch (IgniteCheckedException e) { + catch (Exception e) { throw new IOException("Failed to resolve class for ID: " + id, e); }