Merged Branch_2_2 into trunk

[clebert.suconic]

Trunk is now free to use:

Trunk is free for use… I didn't look at the testsuite results.. but it should be better now. We just need to figure out some other stuff.

@Howard: Please go ahead and merge stomp 1.1

@Francisco: If you want to commit replication on trunk, go ahead. If you change any formatting stuff… please feel free to do it as long as you also commit it on Branch_2_2_EAP.

There's some other stuff to be figured out.. like this commons package.. what to do with it (since it has just part of util, and part of core.api...)

And we need to watch for testcases now. Maybe we should just use ant to run these integration tests, and keep the unit-tests as smoke tests on compilation (fast running tests)

[ataylor]

The integration tests currently dont compile with the error

[ERROR] /home/andy/projects/hornetq/tests/integration-tests/src/test/java/org/hornetq/tests/integration/client/ConsumerTest.java:[85,33] cannot find symbol

[ERROR] symbol  : method createTextMessage(org.hornetq.api.core.client.ClientSession,java.lang.String)

This is because the module cant access classes under src/test under other modules, i will investigate and see how best this should be fixed, unless any one has any ideas?

[ataylor]

actually this should be covered by

      <dependency>

         <groupId>org.hornetq</groupId>

         <artifactId>hornetq-core</artifactId>

         <version>${project.version}</version>

         <scope>test</scope>

         <type>test-jar</type>

      </dependency>

so im not sure why it doesnt work for me

[ataylor]

ok, there were a couple of reasons this was happening, firstly the hornetq-core module wasnt building the test jar so i added

         <plugin>

            <groupId>org.apache.maven.plugins</groupId>

            <artifactId>maven-jar-plugin</artifactId>

            <version>2.3.2</version>

            <executions>

               <execution>

                  <phase>test</phase>

                  <goals>

                     <goal>test-jar</goal>

                  </goals>

               </execution>

            </executions>

         </plugin>

      </plugins>

Also the test modules that were building it were only building at the default phase 'package' so i changed the execution phase to test, will commit soon

[gaohoward]

Now I merged Stomp 1.1 in.

[ataylor]

@Howard the ManagementWithStompTest is failing since your commit

[ataylor]

@clebert    

running the integration-tests i get quite a few errors, about 20, most of which are the same, looks like there is a race condition here is the dump

org.hornetq.tests.integration.cluster.failover.NettyFailoverTest::#test tearDown

*******************************************************************************

Complete Thread dump  has left threads running. Look at thread Thread-10 (HornetQ-client-global-threads-1539064745) id = 83653 has running locators on test  on this following dump

===============================================================================

Thread Thread[Thread-1 (HornetQ-client-global-threads-652850735),5,HornetQ-client-global-threads-652850735] name = Thread-1 (HornetQ-client-global-threads-652850735) id = 83358 group = java.lang.ThreadGroup[name=HornetQ-client-global-threads-652850735,maxpri=10]

java.lang.Object.wait(Native Method)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.getConnectionWithRetry(ClientSessionFactoryImpl.java:1022)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.reconnectSessions(ClientSessionFactoryImpl.java:925)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.failoverOrReconnect(ClientSessionFactoryImpl.java:665)

Oct 12, 2011 1:33:53 PM org.hornetq.core.logging.impl.JULLogDelegate warn

org.hornetq.core.client.impl.ClientSessionFactoryImpl.handleConnectionFailure(ClientSessionFactoryImpl.java:555)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.connectionException(ClientSessionFactoryImpl.java:393)

org.hornetq.core.remoting.impl.netty.NettyConnector$Listener$2.run(NettyConnector.java:724)

org.hornetq.utils.OrderedExecutorFactory$OrderedExecutor$1.run(OrderedExecutorFactory.java:100)

java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)

java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)

java.lang.Thread.run(Thread.java:662)

===============================================================================

Thread Thread[Thread-4 (HornetQ-client-global-threads-1539064745),5,HornetQ-client-global-threads-1539064745] name = Thread-4 (HornetQ-client-global-threads-1539064745) id = 83609 group = java.lang.ThreadGroup[name=HornetQ-client-global-threads-1539064745,maxpri=10]

java.lang.Object.wait(Native Method)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.getConnectionWithRetry(ClientSessionFactoryImpl.java:1022)

Oct 12, 2011 1:33:53 PM org.hornetq.core.logging.impl.JULLogDelegate warn

org.hornetq.core.client.impl.ClientSessionFactoryImpl.reconnectSessions(ClientSessionFactoryImpl.java:925)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.failoverOrReconnect(ClientSessionFactoryImpl.java:665)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.handleConnectionFailure(ClientSessionFactoryImpl.java:555)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.connectionException(ClientSessionFactoryImpl.java:393)

org.hornetq.core.remoting.impl.netty.NettyConnector$Listener$2.run(NettyConnector.java:724)

org.hornetq.utils.OrderedExecutorFactory$OrderedExecutor$1.run(OrderedExecutorFactory.java:100)

java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)

java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)

java.lang.Thread.run(Thread.java:662)

===============================================================================

Thread Thread[Thread-0 (HornetQ-server-HornetQServerImpl::server 5-1879093729),5,HornetQ-server-HornetQServerImpl::server 5-1879093729] name = Thread-0 (HornetQ-server-HornetQServerImpl::server 5-1879093729) id = 83757 group = java.lang.ThreadGroup[name=HornetQ-server-HornetQServerImpl::server 5-1879093729,maxpri=10]

java.lang.Object.wait(Native Method)

org.hornetq.core.client.impl.ServerLocatorImpl.createSessionFactory(ServerLocatorImpl.java:735)

org.hornetq.core.client.impl.ServerLocatorImpl.connect(ServerLocatorImpl.java:577)

Oct 12, 2011 1:33:53 PM org.hornetq.core.logging.impl.JULLogDelegate warn

org.hornetq.core.server.cluster.impl.ClusterConnectionImpl$2.run(ClusterConnectionImpl.java:469)

org.hornetq.utils.OrderedExecutorFactory$OrderedExecutor$1.run(OrderedExecutorFactory.java:100)

java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)

java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)

Oct 12, 2011 1:33:53 PM org.hornetq.core.logging.impl.JULLogDelegate warn

java.lang.Thread.run(Thread.java:662)

===============================================================================

Thread Thread[main,5,main] name = main id = 1 group = java.lang.ThreadGroup[name=main,maxpri=10]

java.lang.Thread.dumpThreads(Native Method)

java.lang.Thread.getAllStackTraces(Thread.java:1530)

Oct 12, 2011 1:33:53 PM org.hornetq.core.logging.impl.JULLogDelegate warn

org.hornetq.tests.util.UnitTestCase.threadDump(UnitTestCase.java:358)

org.hornetq.tests.util.UnitTestCase.tearDown(UnitTestCase.java:927)

org.hornetq.tests.util.ServiceTestBase.tearDown(ServiceTestBase.java:99)

org.hornetq.tests.integration.cluster.failover.FailoverTestBase.tearDown(FailoverTestBase.java:213)

org.hornetq.tests.integration.cluster.failover.FailoverTest.tearDown(FailoverTest.java:103)

junit.framework.TestCase.runBare(TestCase.java:136)

junit.framework.TestResult$1.protect(TestResult.java:106)

junit.framework.TestResult.runProtected(TestResult.java:124)

junit.framework.TestResult.run(TestResult.java:109)

junit.framework.TestCase.run(TestCase.java:120)

junit.framework.TestSuite.runTest(TestSuite.java:230)

junit.framework.TestSuite.run(TestSuite.java:225)

sun.reflect.GeneratedMethodAccessor2.invoke(Unknown Source)

sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)

java.lang.reflect.Method.invoke(Method.java:597)

org.apache.maven.surefire.junit.JUnitTestSet.execute(JUnitTestSet.java:97)

org.apache.maven.surefire.junit.JUnit3Provider.executeTestSet(JUnit3Provider.java:108)

org.apache.maven.surefire.junit.JUnit3Provider.invoke(JUnit3Provider.java:85)

sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)

Oct 12, 2011 1:33:53 PM org.hornetq.core.logging.impl.JULLogDelegate warn

sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)

sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)

java.lang.reflect.Method.invoke(Method.java:597)

org.apache.maven.surefire.booter.ProviderFactory$ClassLoaderProxy.invoke(ProviderFactory.java:103)

$Proxy0.invoke(Unknown Source)

org.apache.maven.surefire.booter.SurefireStarter.invokeProvider(SurefireStarter.java:150)

org.apache.maven.surefire.booter.SurefireStarter.runSuitesInProcess(SurefireStarter.java:91)

Oct 12, 2011 1:33:53 PM org.hornetq.core.logging.impl.JULLogDelegate warn

org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:69)

===============================================================================

Thread Thread[hornetq-discovery-group-thread-dg1,5,HornetQ-server-HornetQServerImpl::server 5-1879093729] name = hornetq-discovery-group-thread-dg1 id = 83758 group = java.lang.ThreadGroup[name=HornetQ-server-HornetQServerImpl::server 5-1879093729,maxpri=10]

java.net.PlainDatagramSocketImpl.receive0(Native Method)

java.net.PlainDatagramSocketImpl.receive(PlainDatagramSocketImpl.java:145)

java.net.DatagramSocket.receive(DatagramSocket.java:725)

org.hornetq.core.cluster.impl.DiscoveryGroupImpl.run(DiscoveryGroupImpl.java:317)

java.lang.Thread.run(Thread.java:662)

===============================================================================

Thread Thread[Thread-10 (HornetQ-client-global-threads-1539064745),5,HornetQ-client-global-threads-1539064745] name = Thread-10 (HornetQ-client-global-threads-1539064745) id = 83653 group = java.lang.ThreadGroup[name=HornetQ-client-global-threads-1539064745,maxpri=10]

java.lang.Object.wait(Native Method)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.getConnectionWithRetry(ClientSessionFactoryImpl.java:1022)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.reconnectSessions(ClientSessionFactoryImpl.java:925)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.failoverOrReconnect(ClientSessionFactoryImpl.java:665)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.handleConnectionFailure(ClientSessionFactoryImpl.java:555)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.connectionException(ClientSessionFactoryImpl.java:393)

org.hornetq.core.remoting.impl.netty.NettyConnector$Listener$2.run(NettyConnector.java:724)

org.hornetq.utils.OrderedExecutorFactory$OrderedExecutor$1.run(OrderedExecutorFactory.java:100)

java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)

Oct 12, 2011 1:33:53 PM org.hornetq.core.logging.impl.JULLogDelegate warn

java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)

java.lang.Thread.run(Thread.java:662)

===============================================================================

Oct 12, 2011 1:33:53 PM org.hornetq.core.logging.impl.JULLogDelegate warn

Thread Thread[Thread-4 (HornetQ-client-global-threads-1570404609),5,HornetQ-client-global-threads-1570404609] name = Thread-4 (HornetQ-client-global-threads-1570404609) id = 83804 group = java.lang.ThreadGroup[name=HornetQ-client-global-threads-1570404609,maxpri=10]

java.lang.Object.wait(Native Method)

Oct 12, 2011 1:33:53 PM org.hornetq.core.logging.impl.JULLogDelegate warn

org.hornetq.core.client.impl.ClientSessionFactoryImpl.getConnectionWithRetry(ClientSessionFactoryImpl.java:1022)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.reconnectSessions(ClientSessionFactoryImpl.java:925)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.failoverOrReconnect(ClientSessionFactoryImpl.java:665)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.handleConnectionFailure(ClientSessionFactoryImpl.java:555)

Oct 12, 2011 1:33:53 PM org.hornetq.core.logging.impl.JULLogDelegate warn

org.hornetq.core.client.impl.ClientSessionFactoryImpl.connectionException(ClientSessionFactoryImpl.java:393)

org.hornetq.core.remoting.impl.netty.NettyConnector$Listener$2.run(NettyConnector.java:724)

org.hornetq.utils.OrderedExecutorFactory$OrderedExecutor$1.run(OrderedExecutorFactory.java:100)

java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)

java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)

java.lang.Thread.run(Thread.java:662)

===============================================================================

Thread Thread[Reference Handler,10,system] name = Reference Handler id = 2 group = java.lang.ThreadGroup[name=system,maxpri=10]

java.lang.Object.wait(Native Method)

java.lang.Object.wait(Object.java:485)

java.lang.ref.Reference$ReferenceHandler.run(Reference.java:116)

===============================================================================

Thread Thread[Thread-6 (HornetQ-client-global-threads-652850735),5,HornetQ-client-global-threads-652850735] name = Thread-6 (HornetQ-client-global-threads-652850735) id = 83395 group = java.lang.ThreadGroup[name=HornetQ-client-global-threads-652850735,maxpri=10]

java.lang.Object.wait(Native Method)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.getConnectionWithRetry(ClientSessionFactoryImpl.java:1022)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.reconnectSessions(ClientSessionFactoryImpl.java:925)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.failoverOrReconnect(ClientSessionFactoryImpl.java:665)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.handleConnectionFailure(ClientSessionFactoryImpl.java:555)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.connectionException(ClientSessionFactoryImpl.java:393)

org.hornetq.core.remoting.impl.netty.NettyConnector$Listener$2.run(NettyConnector.java:724)

org.hornetq.utils.OrderedExecutorFactory$OrderedExecutor$1.run(OrderedExecutorFactory.java:100)

java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)

java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)

java.lang.Thread.run(Thread.java:662)

===============================================================================

Thread Thread[Signal Dispatcher,9,system] name = Signal Dispatcher id = 4 group = java.lang.ThreadGroup[name=system,maxpri=10]

===============================================================================

Thread Thread[Thread-3 (HornetQ-client-global-threads-1570404609),5,HornetQ-client-global-threads-1570404609] name = Thread-3 (HornetQ-client-global-threads-1570404609) id = 83803 group = java.lang.ThreadGroup[name=HornetQ-client-global-threads-1570404609,maxpri=10]

java.lang.Object.wait(Native Method)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.getConnectionWithRetry(ClientSessionFactoryImpl.java:1022)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.reconnectSessions(ClientSessionFactoryImpl.java:925)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.failoverOrReconnect(ClientSessionFactoryImpl.java:665)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.handleConnectionFailure(ClientSessionFactoryImpl.java:555)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.connectionException(ClientSessionFactoryImpl.java:393)

Oct 12, 2011 1:33:53 PM org.hornetq.core.logging.impl.JULLogDelegate warn

org.hornetq.core.remoting.impl.netty.NettyConnector$Listener$2.run(NettyConnector.java:724)

org.hornetq.utils.OrderedExecutorFactory$OrderedExecutor$1.run(OrderedExecutorFactory.java:100)

java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)

java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)

java.lang.Thread.run(Thread.java:662)

===============================================================================

Thread Thread[Thread-17 (HornetQ-client-global-threads-1539064745),5,HornetQ-client-global-threads-1539064745] name = Thread-17 (HornetQ-client-global-threads-1539064745) id = 83737 group = java.lang.ThreadGroup[name=HornetQ-client-global-threads-1539064745,maxpri=10]

java.lang.Object.wait(Native Method)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.getConnectionWithRetry(ClientSessionFactoryImpl.java:1022)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.reconnectSessions(ClientSessionFactoryImpl.java:925)

Oct 12, 2011 1:33:53 PM org.hornetq.core.logging.impl.JULLogDelegate warn

org.hornetq.core.client.impl.ClientSessionFactoryImpl.failoverOrReconnect(ClientSessionFactoryImpl.java:665)

Oct 12, 2011 1:33:53 PM org.hornetq.core.logging.impl.JULLogDelegate warn

org.hornetq.core.client.impl.ClientSessionFactoryImpl.handleConnectionFailure(ClientSessionFactoryImpl.java:555)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.connectionException(ClientSessionFactoryImpl.java:393)

org.hornetq.core.remoting.impl.netty.NettyConnector$Listener$2.run(NettyConnector.java:724)

org.hornetq.utils.OrderedExecutorFactory$OrderedExecutor$1.run(OrderedExecutorFactory.java:100)

java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)

java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)

java.lang.Thread.run(Thread.java:662)

===============================================================================

Thread Thread[Finalizer,8,system] name = Finalizer id = 3 group = java.lang.ThreadGroup[name=system,maxpri=10]

java.lang.Object.wait(Native Method)

java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:118)

java.lang.ref.ReferenceQueue.remove(ReferenceQueue.java:134)

java.lang.ref.Finalizer$FinalizerThread.run(Finalizer.java:159)

===============================================================================

Thread Thread[Thread-0 (HornetQ-client-global-threads-652850735),5,HornetQ-client-global-threads-652850735] name = Thread-0 (HornetQ-client-global-threads-652850735) id = 83356 group = java.lang.ThreadGroup[name=HornetQ-client-global-threads-652850735,maxpri=10]

java.lang.Object.wait(Native Method)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.getConnectionWithRetry(ClientSessionFactoryImpl.java:1022)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.reconnectSessions(ClientSessionFactoryImpl.java:925)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.failoverOrReconnect(ClientSessionFactoryImpl.java:665)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.handleConnectionFailure(ClientSessionFactoryImpl.java:555)

org.hornetq.core.client.impl.ClientSessionFactoryImpl.connectionException(ClientSessionFactoryImpl.java:393)

org.hornetq.core.remoting.impl.netty.NettyConnector$Listener$2.run(NettyConnector.java:724)

org.hornetq.utils.OrderedExecutorFactory$OrderedExecutor$1.run(OrderedExecutorFactory.java:100)

java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)

java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)

java.lang.Thread.run(Thread.java:662)

===============================================================================

End Thread dump  has left threads running. Look at thread Thread-10 (HornetQ-client-global-threads-1539064745) id = 83653 has running locators on test  on this following dump

*******************************************************************************

[gaohoward]

Doh! I missed that tests. Just fixed it. Thanks Andy.

Howard

[clebert.suconic]

Tests are always supposed to release their threads...

If a test leave any threads around, it will fail. That's a condition that has been pretty useful for me on the EAP/AS7 branch. I think we should stick to it.

also: There's an issue on the testsuite now.. it's not using the logger settings.

[ataylor]

thats my point clebert, there are lots of tests failing because of this and for the same reason, i can only guess its because of your changes.

[clebert.suconic]

I don't see any test failing because of hanging threads on hudson now.

If there is any threads hanging.. we need to fix them. The testsuite would let it pass silently before. With this constraint now, it will show up early.

The point of adding this constraint is to avoid tests failing because you don't know why. (tests making other tests fail in cascade). e.g. the spring tests.

If we remove this constraint we may just hide the dirty.

[clebert.suconic]

what I meant by the spring tests was...

there was a non-related test failing because of a thread that was left running on the spring test. Having this constraing helped fix the cascade effect.

[clebert.suconic]

@Andy:if that's a quickie for you, can you please setup the testsuite on trunk to use the logger format please?

[clebert.suconic]

Just making a private email public as part of the list. I thought the info was relevant so made it public.

Hi everyone,

Some minor notes on the merges:

* At CoreProtocolManager (line 215 or search for HORNETQ-720), I was announcing the backup to the cluster. Now the APIs have changed.
Should I instantiate a new server locator to call notifyNodeUp(...)? Or do something different like send a CLUSTER_TOPOLOGY(_2?) message?

* HornetQServerImpl already had a 'started' boolean flag, with Clebert's merge now there is a 'stopped' boolean value. HornetQServer also had a isStarted(), and now got a isStopped().

- IF there isn't any need to distinguish between these, I propose we keep 'started/isStarted()', as that exists in HornetQComponent as well.
- IF we need to distinguish intermediate states (say 'start', 'startING', 'stop' etc), I propose to turn that isStarted() into a getState() that returns an instance of an State enum with all proper states. 

* PagingTest line 2518, the assert is commented out, and we just log an error. Any reasons not to enable the assert?

* Some changes from Andy at HornetQPacketHandler done against the replication branch (search for HORNETQ-720) left out commented code. Should we just delete the commented code?

[...]

The replication tests I ran locally are failing because they can't see the backup starting up. I think the best is to commit, see if any tests unrelated to replication are affected, and then focus on getting the backup to start-up correctly again.

Cheers,
Francisco Borges

[clebert.suconic]

- The node announcement should happen through ClusterConnection always.

Talk to me if you don't have a cluster connection configured at your context. (or through the forum here.. open a new thread on that case)

- At some point I needed to assert for stopped on the testsuite, and had the flag being set in a different place. I don't think that's being used any longer.. it can go away now.

- I'm not sure about what you're saying about HornetQPacketHandler. @Andy do you have the context?

I guess yeah the best is to commit on trunk and fix tests.