Collect both normal and full schema, making the latter optional as it is not available on Cassandra 1.2

This restores the collector's ability to run on version 1.2 clusters

Author: michaelsembwever

ds-collector/ds-collector

@@ -610,7 +610,8 @@ collect_info_setup() {
     cqlshOpts="$cqlshOpts --ssl"
   fi
   mkdir -p "${artifactDir}/sstable-statistics/"
-  echo "DESCRIBE FULL SCHEMA;" > "$artifactDir/execute_schema.cql"
+  echo "DESCRIBE SCHEMA;" > "$artifactDir/execute_schema.cql"
+  echo "DESCRIBE FULL SCHEMA;" > "$artifactDir/execute_full_schema.cql"
   echo "DESCRIBE CLUSTER;" > "$artifactDir/execute_metadata.cql"
 
   # 'timeout -t SECS' is required on older busybox

ds-collector/rust-commands/collect-info.rs

@@ -336,6 +336,18 @@ const COMMANDS: &[Cmd<'static>] = &[
         use_sudo: false,
         use_timeout: false,
     },
+    // cqlsh "$(hostname)" $cqlshOpts -e 'DESCRIBE FULL SCHEMA;' > "$artifactDir/schema.cql"
+    // this overrides schema.cql (but won't work in Cassandra verision 1.2 so is optional)
+    Cmd {
+        command: "cqlsh",
+        args: "{cqlsh_host} {cqlsh_port} {cqlsh_opts} -f {artifact_dir}/execute_full_schema.cql",
+        file: "schema.cql",
+        optional: true,
+        skip_flags: "",
+        use_stdout: true,
+        use_sudo: false,
+        use_timeout: false,
+    },
     // cqlsh "$(hostname)" $cqlshOpts -e 'DESCRIBE CLUSTER;' > "$artifactDir/metadata.cql"
     Cmd {
         command: "cqlsh",