removed yourkit config, and updated puppet scripts to use Oracle's JVM

fcrepo4-labs · Nov 15, 2013 · 4add23d · 4add23d
1 parent 728e0ac
commit 4add23d
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 100 deletions.
diff --git a/cloud-init/create-ec2-instance.conf b/cloud-init/create-ec2-instance.conf
@@ -1,7 +1,7 @@
 aws_region=us-east-1
 aws_ami=ami-ef277b86
 aws_instance_type=m1.large
-aws_group=[...]
-aws_key=[...]
-aws_block_device_mapping='/dev/sda1=:10::io1:100'
+aws_group=ff-fasseg
+aws_key=fasseg
+aws_block_device_mapping='/dev/sda1=:100::io1:1000'
 aws_ebs_optimized=true
diff --git a/modules/tomcat7/manifests/init.pp b/modules/tomcat7/manifests/init.pp
@@ -39,39 +39,67 @@
     $ensure = running,
     $http_port = 8080,
     $https_port = 8443,
-    $jre = 'default',
     $install_admin = true,
-    $data_dir = '/mnt/fcrepo4-data',
-    $repo_config = 'classpath:/config/async-indexing/repository.json',
-#    $repo_config = 'classpath:/config/clustered/repository.json',
-    $etc_default_tomcat = 'tomcat7/default-tomcat7.erb',
-#    $etc_default_tomcat = 'tomcat7/default-tomcat7-clustered.erb',
-    $install_yourkit = false, 
+    $data_dir = '/home/ubuntu/fcrepo4-data',
+    $repo_config = 'classpath:/config/clustered/repository.json',
+    $etc_default_tomcat = 'tomcat7/default-tomcat7-clustered.erb',
 ) {
 
-  if ($install_yourkit) {
-    include yourkit
-    $yourkitdir = "$yourkit::yourkit"
-  }
-
-  $jre_package = "${jre}-jre-headless"
   $private_ip = "${ip_address}"
 
   notify {"$ip_address":}
 
-  exec { "increase send buffer size":
+  exec { "sndbuf":
+    before => Exec['recvbuf'],
     command => "sudo sysctl -w net.core.rmem_max=5242880",
     path => "/bin/:/usr/bin/",
   }
 
-  exec { "increase recv buffer size":
+  exec { "recvbuf":
+    before => Exec['jdk7'],
     command => "sudo sysctl -w net.core.wmem_max=5242880",
     path => "/bin/:/usr/bin/",
   }
 
+  exec { "jdk7":
+    before => Exec['untar'],
+    command => "/usr/bin/wget get -O /home/ubuntu/jdk7.tar.gz --no-cookies --header \"Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com\" \"http://download.oracle.com/otn-pub/java/jdk/7u45-b18/jdk-7u45-linux-x64.tar.gz\"",
+    path => "/bin/:/usr/bin/",
+    returns => ['0','1','4'],
+  }
+
+  exec { "untar":
+    before => Exec['mkdir'],
+    command => "tar -zxvf /home/ubuntu/jdk7.tar.gz",
+    path => "/bin/:/usr/bin/",
+  }
+
+  exec { "mkdir":
+    before => Exec['move'],
+    command => "sudo mkdir -p /usr/lib/jvm",
+    path => "/bin/:/usr/bin/",
+  }
+
+  exec { "move":
+    before => Exec['alt-install'],
+    command => "sudo mv ./jdk1.7.0_45 /usr/lib/jvm/jdk1.7.0_45",
+    path => "/bin/:/usr/bin/",
+  }
+
+  exec { "alt-install":
+    before => Exec['alt-set'],
+    command => "sudo update-alternatives --install \"/usr/bin/java\" \"java\" \"/usr/lib/jvm/jdk1.7.0_45/bin/java\" 1",
+    path => "/bin/:/usr/bin/",
+  }
+
+  exec { "alt-set":
+    before => Package['tomcat7'],
+    command => "sudo update-alternatives --install \"/usr/bin/java\" \"java\" \"/usr/lib/jvm/jdk1.7.0_45/bin/java\" 1",
+    path => "/bin/:/usr/bin/",
+  }
+
   package { 'tomcat7':
     ensure => installed,
-    require => Package[$jre_package],
   }
 
   if ($install_admin) {
@@ -81,9 +109,6 @@
     }
   }
 
-  package { $jre_package:
-  }
-
   file { '/etc/tomcat7/server.xml':
      owner => 'root',
      content => template('tomcat7/server.xml.erb'),
@@ -106,30 +131,12 @@
      require => Package['tomcat7'],
   }
 
-  if ($install_yourkit) {
-
-    service { 'tomcat7':
-      ensure => $ensure,
-      enable => $enable,
-      require => [Package['tomcat7'],
-        File[$data_dir],
-        File['/etc/default/tomcat7'],
-        Exec['untar yourkit'],
-      ],
-    }
-
-  } 
-  else {
-
-    service { 'tomcat7':
-      ensure => $ensure,
-      enable => $enable,
-      require => [Package['tomcat7'],
-        File[$data_dir],
-        File['/etc/default/tomcat7'],
-      ],
-    }
-
+  service { 'tomcat7':
+    ensure => $ensure,
+    enable => $enable,
+    require => [Package['tomcat7'],
+      File[$data_dir],
+      File['/etc/default/tomcat7'],
+    ],
   }
-
 }
diff --git a/modules/tomcat7/templates/default-tomcat7-clustered.erb b/modules/tomcat7/templates/default-tomcat7-clustered.erb
@@ -9,7 +9,7 @@ TOMCAT7_GROUP=tomcat7
 # The home directory of the Java development kit (JDK). You need at least
 # JDK version 1.5. If JAVA_HOME is not set, some common directories for 
 # OpenJDK, the Sun JDK, and various J2SE 1.5 versions are tried.
-#JAVA_HOME=/usr/lib/jvm/openjdk-6-jdk
+JAVA_HOME=/usr/lib/jvm/jdk1.7.0_45
 
 # You may pass JVM startup parameters to Java here. If unset, the default
 # options will be: -Djava.awt.headless=true -Xmx128m -XX:+UseConcMarkSweepGC
@@ -48,11 +48,6 @@ JAVA_OPTS="${JAVA_OPTS} -Dfcrepo.ispn.jgroups.configuration=jgroups-ec2.xml"
 JAVA_OPTS="${JAVA_OPTS} -Djgroups.s3.bucket=fcrepo4-cluster-0"
 
 
-# YourKit Profiling
-<% if install_yourkit == true %>
-JAVA_OPTS="${JAVA_OPTS} -agentpath:/opt/<%= yourkitdir %>/bin/linux-x86-64/libyjpagent.so"
-<% end %>
-
 #set fcrepo4 baseUrl for fixity-service
 JAVA_OPTS="${JAVA_OPTS} -Dorg.fcrepo.fixity.fcrepo.url=http://localhost:8080/fcrepo/rest -Dorg.fcrepo.fixity.brokerurl=tcp://localhost:61616"
 
@@ -86,3 +81,6 @@ JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.config.file=/var/lib/tomcat7/conf/lo
 # NOTE: authbind works only with IPv4.  Do not enable it when using IPv6.
 # (yes/no, default: no)
 #AUTHBIND=no
+
+# replication timeout for infinispan
+JAVA_OPTS="${JAVA_OPTS} -Dfcrepo.ispn.replication.timeout=500000"
diff --git a/modules/yourkit/manifests/init.pp b/modules/yourkit/manifests/init.pp
diff --git a/site/site.pp b/site/site.pp
@@ -1,10 +1,6 @@
 # This file is used by the cloud-init magic.
 node default {
 
-  class { 'tomcat7':
-    jre => 'openjdk-7',
-  }
-
   tomcat7::fcrepo-webapp { "fcrepo webapp":
     url => 'http://ci.fcrepo.org/jenkins/job/fcrepo4/lastSuccessfulBuild/org.fcrepo\$fcrepo-webapp/artifact/org.fcrepo/fcrepo-webapp/4.0.0-alpha-3-SNAPSHOT/fcrepo-webapp-4.0.0-alpha-3-SNAPSHOT.war',
     war => 'fcrepo.war',