[GitHub] activemq-artemis pull request #1907: ARTEMIS-1705 Queue stop deliver after r...

2018-02-27 Thread morefuntang
GitHub user morefuntang opened a pull request:

https://github.com/apache/activemq-artemis/pull/1907

ARTEMIS-1705 Queue stop deliver after remove all paged message over JMX

I remove all messages in Queue via removeAllMessages in JMX

After removed all paged message, queue stopped deliver message.

During debug, we found that memory size of the queue is more then 2 pages 
size, but both message references and intermediate message references are empty.

The deliver runner will not depage because queue memory size is over max 
size.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/morefuntang/activemq-artemis live-only-2.4.0

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/activemq-artemis/pull/1907.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1907


commit 430648661db6871e3f6d3cbfa42d52e4cad6f24c
Author: 17103355 <17103355@...>
Date:   2018-02-28T03:38:00Z

Only messages from MessageReferences are subtracted from the queueMemorySize

commit bc6084ba5a14f73ef7d67d679df043bbb2412cbd
Author: 17103355 <17103355@...>
Date:   2018-02-28T03:46:08Z

Only messages from MessageReferences are subtracted from the queueMemorySize




---


[GitHub] activemq-artemis issue #1903: ARTEMIS-1706 - Add support for wantClientAuth

2018-02-27 Thread cshannon
Github user cshannon commented on the issue:

https://github.com/apache/activemq-artemis/pull/1903
  
I am going to update my PR with Tim’s suggestion to have it match 5.x and 
rebase in the morning


---


[GitHub] activemq-artemis issue #1903: ARTEMIS-1706 - Add support for wantClientAuth

2018-02-27 Thread clebertsuconic
Github user clebertsuconic commented on the issue:

https://github.com/apache/activemq-artemis/pull/1903
  
@cshannon rebase it... are you addressing @tabish121's comments or that 
doesn't apply?


---


[GitHub] activemq-artemis pull request #1906: NO-JIRA Improving test and queue.flush(...

2018-02-27 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/activemq-artemis/pull/1906


---


[GitHub] activemq-artemis pull request #1889: ARTEMIS-1698 support 'instance' web dep...

2018-02-27 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/activemq-artemis/pull/1889


---


[GitHub] activemq-artemis pull request #1906: NO-JIRA Improving test and queue.flush(...

2018-02-27 Thread clebertsuconic
GitHub user clebertsuconic opened a pull request:

https://github.com/apache/activemq-artemis/pull/1906

NO-JIRA Improving test and queue.flush()



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/clebertsuconic/activemq-artemis deadlock

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/activemq-artemis/pull/1906.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1906


commit 3f23847feeb37ff173a68d97cc125d459ba94adc
Author: Clebert Suconic 
Date:   2018-02-27T21:44:47Z

NO-JIRA Improving test and queue.flush()




---


[GitHub] activemq-artemis pull request #1905: ARTEMIS-1707 Check for already exists e...

2018-02-27 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/activemq-artemis/pull/1905


---


[GitHub] activemq-artemis pull request #1905: ARTEMIS-1707 Check for already exists e...

2018-02-27 Thread tabish121
GitHub user tabish121 opened a pull request:

https://github.com/apache/activemq-artemis/pull/1905

ARTEMIS-1707 Check for already exists exceptions and ignore

For address and queue create check for the already exists exceptions and
ignore as another client might have just created the same

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/tabish121/activemq-artemis ARTEMIS-1707

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/activemq-artemis/pull/1905.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1905


commit 38fb17703b3479d1ef933b8f5a99e75f72166c96
Author: Timothy Bish 
Date:   2018-02-27T21:30:06Z

ARTEMIS-1707 Check for already exists exceptions and ignore

For address and queue create check for the already exists exceptions and
ignore as another client might have just created the same




---


[GitHub] activemq-artemis issue #1903: ARTEMIS-1706 - Add support for wantClientAuth

2018-02-27 Thread clebertsuconic
Github user clebertsuconic commented on the issue:

https://github.com/apache/activemq-artemis/pull/1903
  
can you rebase against master? I have sent a fix to the JORAM tests.. this 
would be a helpful as a test as well.



---


[GitHub] activemq-artemis pull request #1904: ARTEMIS-1700 Using IOExecutors for more...

2018-02-27 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/activemq-artemis/pull/1904


---


[GitHub] activemq-artemis pull request #1903: ARTEMIS-1706 - Add support for wantClie...

2018-02-27 Thread tabish121
Github user tabish121 commented on a diff in the pull request:

https://github.com/apache/activemq-artemis/pull/1903#discussion_r171066273
  
--- Diff: docs/user-manual/en/configuring-transports.md ---
@@ -403,6 +403,15 @@ following additional properties:
 This property is only for an `acceptor`. It tells a client
 connecting to this acceptor that 2-way SSL is required. Valid values
 are `true` or `false`. Default is `false`.
+
+-   `wantClientAuth`
+
+This property is only for an `acceptor`. It tells a client
+connecting to this acceptor that 2-way SSL is requested but not 
required. 
+Valid values are `true` or `false`. Default is `false`. 
+
+Note that this setting will override `needClientAuth` if both 
properties 
+are set to true.
 
--- End diff --

I failed to read this before my previous comment but as before I'd have 
opted to go the other way on the choice and defaulted to need if both are 
there.  For reference the 5.x code makes that choice as well when both are 
present on the URI


---


[GitHub] activemq-artemis pull request #1903: ARTEMIS-1706 - Add support for wantClie...

2018-02-27 Thread tabish121
Github user tabish121 commented on a diff in the pull request:

https://github.com/apache/activemq-artemis/pull/1903#discussion_r171060932
  
--- Diff: 
artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
 ---
@@ -468,8 +473,12 @@ public synchronized SslHandler 
getSslHandler(ByteBufAllocator alloc) throws Exce
 
   engine.setUseClientMode(false);
 
-  if (needClientAuth)
+  if (needClientAuth) {
  engine.setNeedClientAuth(true);
+  }
+  if (wantClientAuth) {
--- End diff --

I would probably do this in an else as the setting would override the need 
option and if someone did something silly like specify both I'd generally 
prefer it chose the stronger of the two and setting want after need overrides 
it.  


---


Website Discussion

2018-02-27 Thread Martyn Taylor
All,

I wanted to pick up the website discussion again since it seems to have
stalled.  The last conversation we had was around us setting up a video
call or hackathon to get the ball rolling.  I had a conversation with
Michael Pearce earlier in the week who's put together a potential site map
as well as providing some initial work towards moving towards a Jekyll
based approach.

Are people still interested in a video discussion?  I propose we use the
time to go over the new site design and allocate out some initial tasks to
get the ball rolling.

For those interested how about Monday 5th March, 20:00 UTC?

Cheers
Martyn


[GitHub] activemq-artemis issue #1899: ARTEMIS-1700 Fixed deadlock in paging state

2018-02-27 Thread clebertsuconic
Github user clebertsuconic commented on the issue:

https://github.com/apache/activemq-artemis/pull/1899
  
@shoukunhuai see #1904


---


[GitHub] activemq-artemis pull request #1904: ARTEMIS-1700 Using IOExecutors for more...

2018-02-27 Thread clebertsuconic
GitHub user clebertsuconic opened a pull request:

https://github.com/apache/activemq-artemis/pull/1904

ARTEMIS-1700 Using IOExecutors for more IO tasks



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/clebertsuconic/activemq-artemis deadlock

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/activemq-artemis/pull/1904.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1904






---


[GitHub] activemq-artemis issue #1899: ARTEMIS-1700 Fixed deadlock in paging state

2018-02-27 Thread clebertsuconic
Github user clebertsuconic commented on the issue:

https://github.com/apache/activemq-artemis/pull/1899
  
You're right.. Man!!! you're good! :)

I will send another PR!


---


[GitHub] activemq-artemis pull request #1903: ARTEMIS-1706 - Add support for wantClie...

2018-02-27 Thread cshannon
GitHub user cshannon opened a pull request:

https://github.com/apache/activemq-artemis/pull/1903

ARTEMIS-1706 - Add support for wantClientAuth

Support setting wantClientAuth on a netty acceptor

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/cshannon/activemq-artemis ARTEMIS-1706

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/activemq-artemis/pull/1903.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1903


commit d52397a8db814dc7d470c2d4bf049c680713d969
Author: Christopher L. Shannon (cshannon) 
Date:   2018-02-27T14:47:36Z

ARTEMIS-1706 - Add support for wantClientAuth

Support setting wantClientAuth on a netty acceptor




---


[GitHub] activemq-artemis pull request #1849: ARTEMIS-1656 OpenWire scalability impro...

2018-02-27 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/activemq-artemis/pull/1849


---


[GitHub] activemq-artemis issue #1849: ARTEMIS-1656 OpenWire scalability improvements

2018-02-27 Thread gaohoward
Github user gaohoward commented on the issue:

https://github.com/apache/activemq-artemis/pull/1849
  
@franz1981 @michaelandrepearce I think it's good and am going to merge it.


---


[GitHub] activemq-artemis issue #1862: ARTEMIS-1676 Support overriding of JAVA_ARGS v...

2018-02-27 Thread gaohoward
Github user gaohoward commented on the issue:

https://github.com/apache/activemq-artemis/pull/1862
  
@mtaylor can you update the Windows artemis.profile.cmd, I can test it on 
Windows.


---


[GitHub] activemq-artemis pull request #1896: ARTEMIS-1661 Support splitting of broke...

2018-02-27 Thread asfgit
Github user asfgit closed the pull request at:

https://github.com/apache/activemq-artemis/pull/1896


---


[GitHub] activemq-artemis issue #1896: ARTEMIS-1661 Support splitting of broker.xml

2018-02-27 Thread gaohoward
Github user gaohoward commented on the issue:

https://github.com/apache/activemq-artemis/pull/1896
  
@adirubin good point. I'm going to merge this and improve it in a separate 
commit.


---


[GitHub] activemq-artemis pull request #1889: ARTEMIS-1698 support 'instance' web dep...

2018-02-27 Thread gaohoward
Github user gaohoward commented on a diff in the pull request:

https://github.com/apache/activemq-artemis/pull/1889#discussion_r170900438
  
--- Diff: 
artemis-web/src/main/java/org/apache/activemq/artemis/component/WebServerComponent.java
 ---
@@ -95,34 +95,51 @@ public void configure(ComponentDTO config, String 
artemisInstance, String artemi
 
   handlers = new HandlerList();
 
-  Path warDir = Paths.get(artemisHome != null ? artemisHome : 
".").resolve(webServerConfig.path).toAbsolutePath();
+  Path homeWarDir = Paths.get(artemisHome != null ? artemisHome : 
".").resolve(webServerConfig.path).toAbsolutePath();
+  Path instanceWarDir = Paths.get(artemisInstance != null ? 
artemisInstance : ".").resolve(webServerConfig.path).toAbsolutePath();
 
   if (webServerConfig.apps != null && webServerConfig.apps.size() > 0) 
{
  webContexts = new ArrayList<>();
  for (AppDTO app : webServerConfig.apps) {
-WebAppContext webContext = deployWar(app.url, app.war, warDir);
+Path dirToUse = homeWarDir;
+if (new File(instanceWarDir.toFile().toString() + 
File.separator + app.war).exists()) {
+   dirToUse = instanceWarDir;
+}
+WebAppContext webContext = deployWar(app.url, app.war, 
dirToUse);
 webContexts.add(webContext);
 if (app.war.startsWith("console")) {
consoleUrl = webServerConfig.bind + "/" + app.url;
 }
  }
   }
 
-  ResourceHandler resourceHandler = new ResourceHandler();
-  resourceHandler.setResourceBase(warDir.toString());
-  resourceHandler.setDirectoriesListed(false);
-  resourceHandler.setWelcomeFiles(new String[]{"index.html"});
+  ResourceHandler homeResourceHandler = new ResourceHandler();
+  homeResourceHandler.setResourceBase(homeWarDir.toString());
+  homeResourceHandler.setDirectoriesListed(false);
+  homeResourceHandler.setWelcomeFiles(new String[]{"index.html"});
+
+  ContextHandler homeContext = new ContextHandler();
+  homeContext.setContextPath("/");
+  homeContext.setResourceBase(homeWarDir.toString());
+  homeContext.setHandler(homeResourceHandler);
+  
homeContext.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", 
"false");
+
+  ResourceHandler instanceResourceHandler = new ResourceHandler();
+  instanceResourceHandler.setResourceBase(instanceWarDir.toString());
+  instanceResourceHandler.setDirectoriesListed(false);
+  instanceResourceHandler.setWelcomeFiles(new String[]{"index.html"});
+
+  ContextHandler instanceContext = new ContextHandler();
+  instanceContext.setContextPath("/");
+  instanceContext.setResourceBase(instanceWarDir.toString());
+  instanceContext.setHandler(instanceResourceHandler);
+  
homeContext.setInitParameter("org.eclipse.jetty.servlet.Default.dirAllowed", 
"false");
--- End diff --

@jbertram It looks like setting two root ("/") resource handlers can cause 
confusion. According to my test when 'index.html' appears in both {home}/web 
and {instance}/web, it picks up the one in {home}/web. 



---


[GitHub] activemq-artemis issue #1896: ARTEMIS-1661 Support splitting of broker.xml

2018-02-27 Thread michaelandrepearce
Github user michaelandrepearce commented on the issue:

https://github.com/apache/activemq-artemis/pull/1896
  
@gaohoward Updated docs 👍 


---


[GitHub] activemq-artemis issue #1896: ARTEMIS-1661 Support splitting of broker.xml

2018-02-27 Thread michaelandrepearce
Github user michaelandrepearce commented on the issue:

https://github.com/apache/activemq-artemis/pull/1896
  
@adirubin thats correct, you'll need to "touch" the broker.xml file still, 
this is very similar to the support  for config modularity such as log4j e.g. 
there also you need to "touch" the log4j.xml still.


---


[GitHub] activemq-artemis issue #1837: ARTEMIS-1603 fixed browsing tables under JMX t...

2018-02-27 Thread stanlyDoge
Github user stanlyDoge commented on the issue:

https://github.com/apache/activemq-artemis/pull/1837
  
AFAIK there is some effort to create some Selenium tests. I am not sure 
when it could get into upstream.


---


[GitHub] activemq-artemis issue #1896: ARTEMIS-1661 Support splitting of broker.xml

2018-02-27 Thread adirubin
Github user adirubin commented on the issue:

https://github.com/apache/activemq-artemis/pull/1896
  
Hi michaelandrepearce, thanks!
If I'm not mistaken, the server won't monitor the x-included files for 
changes, which could be a problem.


---


[GitHub] activemq-artemis issue #1895: ARTEMIS-1702 ConcurrentLongHashMap and Concurr...

2018-02-27 Thread franz1981
Github user franz1981 commented on the issue:

https://github.com/apache/activemq-artemis/pull/1895
  
@michaelandrepearce Yes, tested yesterday: exactly the same :+1:  (and for 
free :P)


---


[GitHub] activemq-artemis issue #1849: ARTEMIS-1656 OpenWire scalability improvements

2018-02-27 Thread franz1981
Github user franz1981 commented on the issue:

https://github.com/apache/activemq-artemis/pull/1849
  
@michaelandrepearce Yep, it has passed the same tests as master with no 
regressions, hence it can be merged :+1: 


---