update docs and cassandra docker-compose service

thelastpickle · Mar 13, 2020 · 6f228c4 · 6f228c4
1 parent 80c5ba3
commit 6f228c4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/docs/content/docs/download/docker.md b/src/docs/content/docs/download/docker.md
@@ -118,6 +118,14 @@ The `nodetool` Docker Compose service can be used to check on the Cassandra node
 docker-compose run nodetool status
 ```
 
+You can alternatively attach directly to the Cassandra container and run `nodetool status` from within it. 
+
+First, find the Cassandra container with `docker ps | grep cassandra`. 
+
+Then attach to the container with `docker exec -it <container-id> /bin/bash`.
+
+Now that you have a bash shell in the container, you can run `nodetool -u reaperUser -pwf /etc/cassandra/jmxremote.password`.
+
 Once the Cassandra node is online and accepting CQL connections, create the required `reaper_db` Cassandra keyspace to allow Reaper to save its cluster and scheduling data.
 
 By default, the `reaper_db` keyspace is created using a replication factor of 1. To change this replication factor, provide the intended replication factor as an optional argument:
@@ -193,7 +201,8 @@ For the **SSL encrypted** environment use:
 docker-compose run nodetool-ssl status
 ```
 
-When adding the Cassandra node to the Reaper UI, the above commands can be used to find the node IP address.
+When adding the Cassandra node to the Reaper UI with the IP address, the above commands can be used to find the node IP address.
+You can also add the Cassandra node to the Reaper UI by hostname. The container's hostname is the docker-compose service name.
 
 A `cqlsh` Docker Compose service is included as well for both the default and SSL encrypted environments to allow the creation of user tables in Cassandra.
 

diff --git a/src/packaging/docker-compose.yml b/src/packaging/docker-compose.yml
@@ -13,15 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version: '2.1'
+version: '2.3'
 
 services:
   cassandra-common:
     image: cassandra:3.11
     env_file:
       - ./docker-services/cassandra/cassandra.env
-    mem_limit: 4g
-    memswap_limit: 4g
+    mem_limit: 1g
+    memswap_limit: 1g
     mem_swappiness: 0
     ports:
       - "7000:7000"

diff --git a/src/packaging/docker-services/cassandra/cassandra.env b/src/packaging/docker-services/cassandra/cassandra.env
@@ -32,3 +32,7 @@ CASSANDRA_ENDPOINT_SNITCH=GossipingPropertyFileSnitch
 # open JMX port for access by Reaper
 # WARNING: this is unsafe in production without proper firewall settings
 LOCAL_JMX=no
+
+# JVM heap settings
+MAX_HEAP_SIZE=512M
+HEAP_NEWSIZE=128M