From: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Date: Thu, 24 Mar 2016 21:46:42 +0000 (-0400)
Subject: Disable live tracing feature
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=ee8d0c4009f3f18400fa2369ac51158bcefb627c;p=deliverable%2Ftracecompass.git

Disable live tracing feature

The Live Tracing feature is quite limited and error prone. Some
of the shortcomings are documented in bug 486728. Since there are no
short term plans to improve this in Neon, perhaps it is better to
disable this for now.

Change-Id: Iaf6cab29ce55fde58296aab9935d220eee29a297
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/69285
Reviewed-by: Hudson CI
Reviewed-by: Jonathan Rajotte Julien <jonathan.rajotte-julien@efficios.com>
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
---

diff --git a/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki b/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki
index 8c79eef4c3..83b02e3bb0 100644
--- a/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki
+++ b/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki
@@ -1142,7 +1142,7 @@ Fill in all necessary information, select the radio button for '''Snapshot Mode'
 
 Refer to chapter [[#Recording a Snapshot | Recording a Snapshot]] for how to create a snapshot.
 
-=== Creating a Live Tracing Session ===
+<!--=== Creating a Live Tracing Session ===
 LTTng Tools version v2.4.0 introduces the possibility to create live tracing sessions. The live mode allows you to stream the trace and view it while it's being recorded. To create such a live session, open the trace session dialog as described in chapter [[#Creating a Tracing Session | Creating a Tracing Session]].
 
 [[Image:images/LTTng2CreateSessionDialog_Live.png]]
@@ -1152,7 +1152,7 @@ In the advanced options, it is possible to set the '''Live Delay'''. The '''Live
 [[Image:images/LTTng2CreateSessionDialog_Live_Advanced.png]]
 
 Fill in all necessary information, select the radio button for '''Live Mode''' and press '''Ok'''.
-
+-->
 === Enabling Channels - General ===
 
 Enabling channels can be done using a session tree node when the domain hasn't be created in the session or, alternatively on a domain tree node of a session in case the domain is already available.
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.core.tests/src/org/eclipse/tracecompass/lttng2/control/core/tests/relayd/LttngRelayd24TestApplication.java b/lttng/org.eclipse.tracecompass.lttng2.control.core.tests/src/org/eclipse/tracecompass/lttng2/control/core/tests/relayd/LttngRelayd24TestApplication.java
index be5c10ad57..f37ef2eb82 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.core.tests/src/org/eclipse/tracecompass/lttng2/control/core/tests/relayd/LttngRelayd24TestApplication.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.core.tests/src/org/eclipse/tracecompass/lttng2/control/core/tests/relayd/LttngRelayd24TestApplication.java
@@ -36,6 +36,7 @@ import org.eclipse.tracecompass.internal.lttng2.control.core.relayd.commands.Ses
 import org.eclipse.tracecompass.internal.lttng2.control.core.relayd.commands.StreamResponse;
 import org.eclipse.tracecompass.internal.lttng2.control.core.relayd.commands.ViewerCommand;
 import org.eclipse.tracecompass.internal.lttng2.control.core.relayd.impl.LttngRelaydConnectorFactory;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -87,6 +88,7 @@ public class LttngRelayd24TestApplication {
      *             network timeout?
      */
     @Test
+    @Ignore
     public void testViewerConnection() throws IOException {
         InetAddress addr = InetAddress.getByName(ADDRESS);
         try (Socket connection = new Socket(addr, PORT);
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.core/src/org/eclipse/tracecompass/internal/lttng2/control/core/model/impl/SessionInfo.java b/lttng/org.eclipse.tracecompass.lttng2.control.core/src/org/eclipse/tracecompass/internal/lttng2/control/core/model/impl/SessionInfo.java
index 53a78fa2e5..d6bb3903dc 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.core/src/org/eclipse/tracecompass/internal/lttng2/control/core/model/impl/SessionInfo.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.core/src/org/eclipse/tracecompass/internal/lttng2/control/core/model/impl/SessionInfo.java
@@ -223,7 +223,8 @@ public class SessionInfo extends TraceInfo implements ISessionInfo {
 
     @Override
     public boolean isLive() {
-        return fIsLive;
+        // FIXME: Disable Live support until we have a better implementation
+        return fIsLive && false;
     }
 
     @Override
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/service/LTTngControlServiceMiTest.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/service/LTTngControlServiceMiTest.java
index ce11fba59a..488a18c528 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/service/LTTngControlServiceMiTest.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/service/LTTngControlServiceMiTest.java
@@ -36,6 +36,7 @@ import org.eclipse.tracecompass.internal.lttng2.control.core.model.impl.SessionI
 import org.eclipse.tracecompass.internal.lttng2.control.ui.views.service.ILttngControlService;
 import org.eclipse.tracecompass.internal.lttng2.control.ui.views.service.LTTngControlServiceConstants;
 import org.eclipse.tracecompass.internal.lttng2.control.ui.views.service.LTTngControlServiceMI;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -72,6 +73,7 @@ public class LTTngControlServiceMiTest extends LTTngControlServiceTest {
     }
 
     @Override
+    @Ignore
     public void testCreateLiveSession() throws ExecutionException {
         fShell.setScenario(SCEN_CREATE_LIVE_SESSION);
 
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/service/LTTngControlServiceTest.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/service/LTTngControlServiceTest.java
index 6e1f4a81fd..07194ef60a 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/service/LTTngControlServiceTest.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/src/org/eclipse/tracecompass/lttng2/control/ui/tests/service/LTTngControlServiceTest.java
@@ -58,6 +58,7 @@ import org.eclipse.tracecompass.internal.lttng2.control.ui.views.service.LTTngCo
 import org.eclipse.tracecompass.internal.lttng2.control.ui.views.service.LTTngControlServiceFactory;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.osgi.framework.FrameworkUtil;
 
@@ -470,6 +471,7 @@ public class LTTngControlServiceTest {
     }
 
     @Test
+    @Ignore
     public void testGetSessionWithLive() {
         try {
             fShell.setScenario(SCEN_GET_SESSION_WITH_LIVE);
@@ -1505,6 +1507,7 @@ public class LTTngControlServiceTest {
     }
 
     @Test
+    @Ignore
     public void testCreateLiveSession() throws ExecutionException {
         fShell.setScenario(SCEN_CREATE_LIVE_SESSION);
 
@@ -1525,6 +1528,7 @@ public class LTTngControlServiceTest {
     }
 
     @Test
+    @Ignore
     public void testCreateLiveSessionErrors() {
         try {
             fShell.setScenario(SCEN_CREATE_LIVE_SESSION_ERRORS);
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TargetNodeComponent.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TargetNodeComponent.java
index 8a09dd9615..37da60e5aa 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TargetNodeComponent.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/model/impl/TargetNodeComponent.java
@@ -278,7 +278,9 @@ public class TargetNodeComponent extends TraceControlComponent implements IRemot
      *
      */
     public boolean isLiveSupported() {
-        return getControlService().isVersionSupported("2.4.0"); //$NON-NLS-1$;
+        return false;
+        // FIXME: Disable Live support until we have a better implementation
+        //return getControlService().isVersionSupported("2.4.0"); //$NON-NLS-1$;
     }
     /**
      * Returns if node supports adding contexts on event