update commits

CDLUC3 · Oct 9, 2024 · 981a85a · 981a85a
1 parent 02777d6
commit 981a85a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/mrt-integ-tests b/mrt-integ-tests
diff --git a/mrt-services/dep_zk/mrt-zk b/mrt-services/dep_zk/mrt-zk
diff --git a/mrt-services/ingest/mrt-ingest b/mrt-services/ingest/mrt-ingest
diff --git a/mrt-services/inventory/mrt-inventory b/mrt-services/inventory/mrt-inventory
diff --git a/mrt-services/mrt-admin-lambda b/mrt-services/mrt-admin-lambda
+1 −1		config/test_config.yml
+6 −5		spec/spec_helper.rb
+25 −21		spec/test/demo_spec.rb
+2 −2		design/data.md
+1 −0		design/states.md
+47 −2		src/main/java/org/cdlib/mrt/zk/Batch.java
+5 −2		src/main/java/org/cdlib/mrt/zk/JobState.java
+26 −1		src/main/ruby/lib/merritt_zk_batch.rb
+6 −0		src/main/ruby/lib/merritt_zk_job.rb
+1 −1		src/main/ruby/spec/states_spec.rb
+4 −0		src/main/ruby/spec/zk_spec.rb
+2 −2		src/test/java/org/cdlib/mrt/zk/StateTest.java
+2 −0		states.yml
+2 −0		ingest-conf/src/main/yaml/ingestConfig.yaml
+1 −0		ingest-it/src/main/resources/resources/ingestConfig.yaml
+17 −0		ingest-src/src/main/java/org/cdlib/mrt/ingest/IngestRequest.java
+10 −5		ingest-src/src/main/java/org/cdlib/mrt/ingest/ProcessManager.java
+1 −1		ingest-src/src/main/java/org/cdlib/mrt/ingest/QueueManager.java
+25 −3		ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/BatchConsumer.java
+57 −23		ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/BatchReportConsumer.java
+21 −2		ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/DownloadConsumer.java
+27 −2		ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/EstimateConsumer.java
+21 −5		ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/InitializeConsumer.java
+21 −2		ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/NotifyConsumer.java
+31 −5		ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/ProcessConsumer.java
+21 −2		ingest-src/src/main/java/org/cdlib/mrt/ingest/consumer/ProvisionConsumer.java
+13 −1		ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/batchProcess/HandlerSubmit.java
+22 −1		ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/provision/HandlerProvision.java
+2 −1		ingest-src/src/main/java/org/cdlib/mrt/ingest/handlers/queue/HandlerSubmit.java
+9 −67		ingest-src/src/main/java/org/cdlib/mrt/ingest/utility/FileUtilAlt.java
+1 −0		ingest-src/src/test/resources/resources/ingestConfig.yaml
+1 −1		buildspec.yml
+3 −3		colladmin-lambda-deploy.sh
+3 −3		lambda-deploy.sh
+43 −0		lambda-pull.sh
+5 −9		mysql-ruby-lambda/Gemfile.lock
+1 −1		src-admintool/Dockerfile
+12 −16		src-admintool/Gemfile.lock
+4 −0		src-admintool/config/reports.yml
+38 −25		src-admintool/queries/consistency_secondary_nodes_query.rb
+18 −11		src-admintool/web/index.html
+3 −4		src-colladmin/Dockerfile
+1 −1		src-colladmin/Gemfile
+2 −2		src-colladmin/Gemfile.lock
+2 −1		src-colladmin/actions/ingest_collection_locks_action.rb
+42 −0		src-colladmin/actions/ingest_queue_action.rb
+74 −0		src-colladmin/actions/ingest_queue_profile_action.rb
+64 −0		src-colladmin/actions/system_state_action.rb
+175 −5		src-colladmin/actions/zookeeper_action.rb
+70 −0		src-colladmin/config/actions.yml
+2 −0		src-colladmin/config/ssm.registry.yml
+3 −0		src-colladmin/lambda_function.rb
+1 −0		src-colladmin/lib/acc_queue.rb
+6 −3		src-colladmin/lib/profile.rb
+146 −1		src-colladmin/lib/queue.rb
+14 −0		src-colladmin/lib/queue_json.rb
+8 −2		src-colladmin/template/properties.js
+15 −9		src-colladmin/template/storage.js
+1 −0		src-colladmin/template/subprofile.js
+1 −1		src-colladmin/web/storeCollNodes.html
+33 −0		src-colladmin/web/zkdump.html
+1 −1		src-common/Dockerfile
+6 −10		src-common/Gemfile.lock
+2 −0		src-common/lambda_base.rb
+22 −7		src-common/template/api-table.css
+34 −6		src-common/template/api-table.js
+4 −0		src-common/template/navmenu.css
+8 −1		src-common/template/navmenu.html