From e279951b0ecc16dfeb3fdd45a94142c9e79887ee Mon Sep 17 00:00:00 2001 From: Martin Whittington Date: Mon, 14 Nov 2016 10:33:43 +0000 Subject: [PATCH 1/5] REDD-608 - Add missing jar for memcached --- recipes/_tomcat-attributes.rb | 69 +++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 32 deletions(-) diff --git a/recipes/_tomcat-attributes.rb b/recipes/_tomcat-attributes.rb index 7feeb7b..aa5a933 100644 --- a/recipes/_tomcat-attributes.rb +++ b/recipes/_tomcat-attributes.rb @@ -1,72 +1,77 @@ # Using catalina-jmx -node.default['artifacts']['catalina-jmx']['groupId'] = "org.apache.tomcat" -node.default['artifacts']['catalina-jmx']['artifactId'] = "tomcat-catalina-jmx-remote" -node.default['artifacts']['catalina-jmx']['version'] = "7.0.54" +node.default['artifacts']['catalina-jmx']['groupId'] = 'org.apache.tomcat' +node.default['artifacts']['catalina-jmx']['artifactId'] = 'tomcat-catalina-jmx-remote' +node.default['artifacts']['catalina-jmx']['version'] = '7.0.54' node.default['artifacts']['catalina-jmx']['type'] = 'jar' node.default['artifacts']['catalina-jmx']['destination'] = "#{node['alfresco']['home']}/lib" node.default['artifacts']['catalina-jmx']['owner'] = node['alfresco']['user'] - - -node.default['artifacts']['memcached-session-manager']['groupId'] = "de.javakaffee.msm" -node.default['artifacts']['memcached-session-manager']['artifactId'] = "memcached-session-manager" -node.default['artifacts']['memcached-session-manager']['version'] = "1.9.2" +node.default['artifacts']['memcached-session-manager']['groupId'] = 'de.javakaffee.msm' +node.default['artifacts']['memcached-session-manager']['artifactId'] = 'memcached-session-manager' +node.default['artifacts']['memcached-session-manager']['version'] = '1.9.2' node.default['artifacts']['memcached-session-manager']['type'] = 'jar' node.default['artifacts']['memcached-session-manager']['destination'] = "#{node['alfresco']['home']}/lib" node.default['artifacts']['memcached-session-manager']['owner'] = node['alfresco']['user'] -node.default['artifacts']['memcached-session-manager-tc7']['groupId'] = "de.javakaffee.msm" -node.default['artifacts']['memcached-session-manager-tc7']['artifactId'] = "memcached-session-manager-tc7" -node.default['artifacts']['memcached-session-manager-tc7']['version'] = "1.9.2" +node.default['artifacts']['memcached-session-manager-tc7']['groupId'] = 'de.javakaffee.msm' +node.default['artifacts']['memcached-session-manager-tc7']['artifactId'] = 'memcached-session-manager-tc7' +node.default['artifacts']['memcached-session-manager-tc7']['version'] = '1.9.2' node.default['artifacts']['memcached-session-manager-tc7']['type'] = 'jar' node.default['artifacts']['memcached-session-manager-tc7']['destination'] = "#{node['alfresco']['home']}/lib" node.default['artifacts']['memcached-session-manager-tc7']['owner'] = node['alfresco']['user'] -node.default['artifacts']['spymemcached']['groupId'] = "net.spy" -node.default['artifacts']['spymemcached']['artifactId'] = "spymemcached" -node.default['artifacts']['spymemcached']['version'] = "2.11.1" +node.default['artifacts']['spymemcached']['groupId'] = 'net.spy' +node.default['artifacts']['spymemcached']['artifactId'] = 'spymemcached' +node.default['artifacts']['spymemcached']['version'] = '2.11.1' node.default['artifacts']['spymemcached']['type'] = 'jar' node.default['artifacts']['spymemcached']['destination'] = "#{node['alfresco']['home']}/lib" node.default['artifacts']['spymemcached']['owner'] = node['alfresco']['user'] -node.default['artifacts']['msm-kryo-serializer']['groupId'] = "de.javakaffee.msm" -node.default['artifacts']['msm-kryo-serializer']['artifactId'] = "msm-kryo-serializer" -node.default['artifacts']['msm-kryo-serializer']['version'] = "1.9.2" +node.default['artifacts']['msm-kryo-serializer']['groupId'] = 'de.javakaffee.msm' +node.default['artifacts']['msm-kryo-serializer']['artifactId'] = 'msm-kryo-serializer' +node.default['artifacts']['msm-kryo-serializer']['version'] = '1.9.2' node.default['artifacts']['msm-kryo-serializer']['type'] = 'jar' node.default['artifacts']['msm-kryo-serializer']['destination'] = "#{node['alfresco']['home']}/lib" node.default['artifacts']['msm-kryo-serializer']['owner'] = node['alfresco']['user'] -node.default['artifacts']['kryo-serializers']['groupId'] = "de.javakaffee" -node.default['artifacts']['kryo-serializers']['artifactId'] = "kryo-serializers" -node.default['artifacts']['kryo-serializers']['version'] = "0.34" +node.default['artifacts']['kryo-serializers']['groupId'] = 'de.javakaffee' +node.default['artifacts']['kryo-serializers']['artifactId'] = 'kryo-serializers' +node.default['artifacts']['kryo-serializers']['version'] = '0.34' node.default['artifacts']['kryo-serializers']['type'] = 'jar' node.default['artifacts']['kryo-serializers']['destination'] = "#{node['alfresco']['home']}/lib" node.default['artifacts']['kryo-serializers']['owner'] = node['alfresco']['user'] -node.default['artifacts']['kryo']['groupId'] = "com.esotericsoftware" -node.default['artifacts']['kryo']['artifactId'] = "kryo" -node.default['artifacts']['kryo']['version'] = "3.0.3" +node.default['artifacts']['kryo']['groupId'] = 'com.esotericsoftware' +node.default['artifacts']['kryo']['artifactId'] = 'kryo' +node.default['artifacts']['kryo']['version'] = '3.0.3' node.default['artifacts']['kryo']['type'] = 'jar' node.default['artifacts']['kryo']['destination'] = "#{node['alfresco']['home']}/lib" node.default['artifacts']['kryo']['owner'] = node['alfresco']['user'] -node.default['artifacts']['minlog']['groupId'] = "com.esotericsoftware" -node.default['artifacts']['minlog']['artifactId'] = "minlog" -node.default['artifacts']['minlog']['version'] = "1.3.0" +node.default['artifacts']['minlog']['groupId'] = 'com.esotericsoftware' +node.default['artifacts']['minlog']['artifactId'] = 'minlog' +node.default['artifacts']['minlog']['version'] = '1.3.0' node.default['artifacts']['minlog']['type'] = 'jar' node.default['artifacts']['minlog']['destination'] = "#{node['alfresco']['home']}/lib" node.default['artifacts']['minlog']['owner'] = node['alfresco']['user'] -node.default['artifacts']['reflectasm']['groupId'] = "com.esotericsoftware" -node.default['artifacts']['reflectasm']['artifactId'] = "reflectasm" -node.default['artifacts']['reflectasm']['version'] = "1.11.3" +node.default['artifacts']['reflectasm']['groupId'] = 'com.esotericsoftware' +node.default['artifacts']['reflectasm']['artifactId'] = 'reflectasm' +node.default['artifacts']['reflectasm']['version'] = '1.11.3' node.default['artifacts']['reflectasm']['type'] = 'jar' node.default['artifacts']['reflectasm']['destination'] = "#{node['alfresco']['home']}/lib" node.default['artifacts']['reflectasm']['owner'] = node['alfresco']['user'] -node.default['artifacts']['asm']['groupId'] = "org.ow2.asm" -node.default['artifacts']['asm']['artifactId'] = "asm" -node.default['artifacts']['asm']['version'] = "5.1" +node.default['artifacts']['asm']['groupId'] = 'org.ow2.asm' +node.default['artifacts']['asm']['artifactId'] = 'asm' +node.default['artifacts']['asm']['version'] = '5.1' +node.default['artifacts']['asm']['type'] = 'jar' +node.default['artifacts']['asm']['destination'] = "#{node['alfresco']['home']}/lib" +node.default['artifacts']['asm']['owner'] = node['alfresco']['user'] + +node.default['artifacts']['asm']['groupId'] = 'org.objenesis' +node.default['artifacts']['asm']['artifactId'] = 'objenesis' +node.default['artifacts']['asm']['version'] = '2.4' node.default['artifacts']['asm']['type'] = 'jar' node.default['artifacts']['asm']['destination'] = "#{node['alfresco']['home']}/lib" node.default['artifacts']['asm']['owner'] = node['alfresco']['user'] From 15b6e281227026e2f7f063d41fcfb34ebbc829a3 Mon Sep 17 00:00:00 2001 From: Martin Whittington Date: Mon, 14 Nov 2016 10:51:42 +0000 Subject: [PATCH 2/5] REDD-608 - Fix bad attributes --- recipes/_tomcat-attributes.rb | 52 +++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/recipes/_tomcat-attributes.rb b/recipes/_tomcat-attributes.rb index aa5a933..df5ef35 100644 --- a/recipes/_tomcat-attributes.rb +++ b/recipes/_tomcat-attributes.rb @@ -69,31 +69,31 @@ node.default['artifacts']['asm']['destination'] = "#{node['alfresco']['home']}/lib" node.default['artifacts']['asm']['owner'] = node['alfresco']['user'] -node.default['artifacts']['asm']['groupId'] = 'org.objenesis' -node.default['artifacts']['asm']['artifactId'] = 'objenesis' -node.default['artifacts']['asm']['version'] = '2.4' -node.default['artifacts']['asm']['type'] = 'jar' -node.default['artifacts']['asm']['destination'] = "#{node['alfresco']['home']}/lib" -node.default['artifacts']['asm']['owner'] = node['alfresco']['user'] +node.default['artifacts']['objenesis']['groupId'] = 'org.objenesis' +node.default['artifacts']['objenesis']['artifactId'] = 'objenesis' +node.default['artifacts']['objenesis']['version'] = '2.4' +node.default['artifacts']['objenesis']['type'] = 'jar' +node.default['artifacts']['objenesis']['destination'] = "#{node['alfresco']['home']}/lib" +node.default['artifacts']['objenesis']['owner'] = node['alfresco']['user'] node.default['tomcat']['jvm_route'] = node['alfresco']['public_hostname'] node.default['tomcat']['global_templates'] = [{ - "dest" => "#{node['alfresco']['home']}/conf", - "filename" => "jmxremote.access", - "owner" => "tomcat" -},{ - "dest" => "#{node['alfresco']['home']}/conf", - "filename" => "jmxremote.password", - "owner" => "tomcat" -},{ - "dest" => "#{node['alfresco']['home']}-alfresco/lib/org/apache/catalina/util", - "filename" => "ServerInfo.properties", - "owner" => "tomcat" -},{ - "dest" => "/etc/security/limits.d", - "filename" => "tomcat_limits.conf", - "owner" => "tomcat" + 'dest' => "#{node['alfresco']['home']}/conf", + 'filename' => 'jmxremote.access', + 'owner' => 'tomcat' +}, { + 'dest' => "#{node['alfresco']['home']}/conf", + 'filename' => 'jmxremote.password', + 'owner' => 'tomcat' +}, { + 'dest' => "#{node['alfresco']['home']}-alfresco/lib/org/apache/catalina/util", + 'filename' => 'ServerInfo.properties', + 'owner' => 'tomcat' +}, { + 'dest' => '/etc/security/limits.d', + 'filename' => 'tomcat_limits.conf', + 'owner' => 'tomcat' }] # Setting JAVA_OPTS @@ -101,25 +101,25 @@ if node['tomcat']['run_base_instance'] node.default['alfresco']['restart_services'] = ['tomcat'] if alfresco_components.include? 'solr' - node.default["tomcat"]["java_options"]['rmi_and_solr'] = "-Dalfresco.home=#{node['alfresco']['home']} -Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']} -Dsolr.solr.home=#{node['alfresco']['solr']['home']} -Dsolr.solr.model.dir=#{node['alfresco']['solr']['alfresco_models']} -Dsolr.solr.content.dir=#{node['alfresco']['solr']['contentstore.path']}" + node.default['tomcat']['java_options']['rmi_and_solr'] = "-Dalfresco.home=#{node['alfresco']['home']} -Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']} -Dsolr.solr.home=#{node['alfresco']['solr']['home']} -Dsolr.solr.model.dir=#{node['alfresco']['solr']['alfresco_models']} -Dsolr.solr.content.dir=#{node['alfresco']['solr']['contentstore.path']}" end else - if alfresco_components.include? "repo" - node.default["alfresco"]["repo_tomcat_instance"]['java_options']['rmi_and_alfhome'] = "-Dalfresco.home=#{node['alfresco']['home']}-alfresco -Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']}" + if alfresco_components.include? 'repo' + node.default['alfresco']['repo_tomcat_instance']['java_options']['rmi_and_alfhome'] = "-Dalfresco.home=#{node['alfresco']['home']}-alfresco -Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']}" if alfresco_components.include? 'yourkit' node.default['alfresco']['repo_tomcat_instance']['java_options']['yourkit'] = "-agentpath:/usr/local/lib64/libyjpagent.so=dir=#{node['tomcat']['cache_root_folder']}/tomcat-alfresco,telemetrylimit=1,builtinprobes=none,onexit=snapshot,sessionname=repo,tmpdir=/usr/share/tomcat-alfresco/temp" end node.default['tomcat']['instances']['alfresco'] = node['alfresco']['repo_tomcat_instance'] end if alfresco_components.include? 'share' - node.default["alfresco"]["share_tomcat_instance"]['java_options']['rmi'] = "-Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']}" + node.default['alfresco']['share_tomcat_instance']['java_options']['rmi'] = "-Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']}" if alfresco_components.include? 'yourkit' node.default['alfresco']['share_tomcat_instance']['java_options']['yourkit'] = "-agentpath:/usr/local/lib64/libyjpagent.so=dir=#{node['tomcat']['cache_root_folder']}/tomcat-share,telemetrylimit=1,builtinprobes=none,onexit=snapshot,sessionname=share,tmpdir=/usr/share/tomcat-share/temp,disableall" end node.default['tomcat']['instances']['share'] = node['alfresco']['share_tomcat_instance'] end if alfresco_components.include? 'solr' - node.default["alfresco"]["solr_tomcat_instance"]['java_options']['rmi_and_solr'] = "-Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']} -Dsolr.solr.model.dir=#{node['alfresco']['solr']['alfresco_models']} -Dsolr.solr.home=#{node['alfresco']['solr']['home']} -Dsolr.solr.content.dir=#{node['alfresco']['solr']['contentstore.path']}" + node.default['alfresco']['solr_tomcat_instance']['java_options']['rmi_and_solr'] = "-Djava.rmi.server.hostname=#{node['alfresco']['rmi_server_hostname']} -Dsolr.solr.model.dir=#{node['alfresco']['solr']['alfresco_models']} -Dsolr.solr.home=#{node['alfresco']['solr']['home']} -Dsolr.solr.content.dir=#{node['alfresco']['solr']['contentstore.path']}" if alfresco_components.include? 'yourkit' node.default['alfresco']['solr_tomcat_instance']['java_options']['yourkit'] = "-agentpath:/usr/local/lib64/libyjpagent.so=dir=#{node['tomcat']['cache_root_folder']}/tomcat-solr,telemetrylimit=1,builtinprobes=none,onexit=snapshot,sessionname=solr,tmpdir=/usr/share/tomcat-solr/temp" end From 4ae018676ae0308b79d2e5277a1fbfec4b3bf4f8 Mon Sep 17 00:00:00 2001 From: Martin Whittington Date: Mon, 14 Nov 2016 11:21:49 +0000 Subject: [PATCH 3/5] REDD-608 - Added missing properties to share.xml.erb --- templates/default/tomcat/share.xml.erb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/templates/default/tomcat/share.xml.erb b/templates/default/tomcat/share.xml.erb index 7b480e7..7e5107d 100644 --- a/templates/default/tomcat/share.xml.erb +++ b/templates/default/tomcat/share.xml.erb @@ -3,7 +3,10 @@ + requestUriIgnorePattern=".*\.(ico|png|gif|jpg|css|js)$" + transcoderFactoryClass="de.javakaffee.web.msm.serializer.kryo.KryoTranscoderFactory" + sticky="true" + sessionBackupAsync="true" + copyCollectionsForSerialization="false" + /> \ No newline at end of file From 3fa09ea9937d48de9ff6e9883f3bba1921b58d14 Mon Sep 17 00:00:00 2001 From: Martin Whittington Date: Mon, 14 Nov 2016 12:23:55 +0000 Subject: [PATCH 4/5] REDD-608 - Added attributes for share.xml.erb defaults --- recipes/_tomcat-attributes.rb | 11 ++++++++--- templates/default/tomcat/share.xml.erb | 6 +++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/recipes/_tomcat-attributes.rb b/recipes/_tomcat-attributes.rb index df5ef35..223cb3f 100644 --- a/recipes/_tomcat-attributes.rb +++ b/recipes/_tomcat-attributes.rb @@ -8,14 +8,14 @@ node.default['artifacts']['memcached-session-manager']['groupId'] = 'de.javakaffee.msm' node.default['artifacts']['memcached-session-manager']['artifactId'] = 'memcached-session-manager' -node.default['artifacts']['memcached-session-manager']['version'] = '1.9.2' +node.default['artifacts']['memcached-session-manager']['version'] = '1.9.3' node.default['artifacts']['memcached-session-manager']['type'] = 'jar' node.default['artifacts']['memcached-session-manager']['destination'] = "#{node['alfresco']['home']}/lib" node.default['artifacts']['memcached-session-manager']['owner'] = node['alfresco']['user'] node.default['artifacts']['memcached-session-manager-tc7']['groupId'] = 'de.javakaffee.msm' node.default['artifacts']['memcached-session-manager-tc7']['artifactId'] = 'memcached-session-manager-tc7' -node.default['artifacts']['memcached-session-manager-tc7']['version'] = '1.9.2' +node.default['artifacts']['memcached-session-manager-tc7']['version'] = '1.9.3' node.default['artifacts']['memcached-session-manager-tc7']['type'] = 'jar' node.default['artifacts']['memcached-session-manager-tc7']['destination'] = "#{node['alfresco']['home']}/lib" node.default['artifacts']['memcached-session-manager-tc7']['owner'] = node['alfresco']['user'] @@ -29,7 +29,7 @@ node.default['artifacts']['msm-kryo-serializer']['groupId'] = 'de.javakaffee.msm' node.default['artifacts']['msm-kryo-serializer']['artifactId'] = 'msm-kryo-serializer' -node.default['artifacts']['msm-kryo-serializer']['version'] = '1.9.2' +node.default['artifacts']['msm-kryo-serializer']['version'] = '1.9.3' node.default['artifacts']['msm-kryo-serializer']['type'] = 'jar' node.default['artifacts']['msm-kryo-serializer']['destination'] = "#{node['alfresco']['home']}/lib" node.default['artifacts']['msm-kryo-serializer']['owner'] = node['alfresco']['user'] @@ -76,6 +76,11 @@ node.default['artifacts']['objenesis']['destination'] = "#{node['alfresco']['home']}/lib" node.default['artifacts']['objenesis']['owner'] = node['alfresco']['user'] +# attributes for share.xml.erb +node.default['tomcat']['memcached']['sticky'] = true +node.default['tomcat']['memcached']['sessionBackupAsync'] = true +node.default['tomcat']['memcached']['copyCollectionsForSerialization'] = false + node.default['tomcat']['jvm_route'] = node['alfresco']['public_hostname'] node.default['tomcat']['global_templates'] = [{ diff --git a/templates/default/tomcat/share.xml.erb b/templates/default/tomcat/share.xml.erb index 7e5107d..0716311 100644 --- a/templates/default/tomcat/share.xml.erb +++ b/templates/default/tomcat/share.xml.erb @@ -5,8 +5,8 @@ memcachedNodes="<%= node['tomcat']['memcached_nodes'] %>" requestUriIgnorePattern=".*\.(ico|png|gif|jpg|css|js)$" transcoderFactoryClass="de.javakaffee.web.msm.serializer.kryo.KryoTranscoderFactory" - sticky="true" - sessionBackupAsync="true" - copyCollectionsForSerialization="false" + sticky="<%= node['tomcat']['memcached'][sticky] %>" + sessionBackupAsync="<%= node['tomcat']['memcached']['sessionBackupAsync'] %>" + copyCollectionsForSerialization="<%= node['tomcat']['memcached']['copyCollectionsForSerialization'] %>" /> \ No newline at end of file From 725277c8295321f732f0c36222863e4c57e1f49e Mon Sep 17 00:00:00 2001 From: Martin Whittington Date: Mon, 14 Nov 2016 12:26:11 +0000 Subject: [PATCH 5/5] REDD-608 - Fix sticky --- templates/default/tomcat/share.xml.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/default/tomcat/share.xml.erb b/templates/default/tomcat/share.xml.erb index 0716311..98c61f4 100644 --- a/templates/default/tomcat/share.xml.erb +++ b/templates/default/tomcat/share.xml.erb @@ -5,7 +5,7 @@ memcachedNodes="<%= node['tomcat']['memcached_nodes'] %>" requestUriIgnorePattern=".*\.(ico|png|gif|jpg|css|js)$" transcoderFactoryClass="de.javakaffee.web.msm.serializer.kryo.KryoTranscoderFactory" - sticky="<%= node['tomcat']['memcached'][sticky] %>" + sticky="<%= node['tomcat']['memcached']['sticky'] %>" sessionBackupAsync="<%= node['tomcat']['memcached']['sessionBackupAsync'] %>" copyCollectionsForSerialization="<%= node['tomcat']['memcached']['copyCollectionsForSerialization'] %>" />