From 211d70c2e8a326af28160bf29b3018e82dbc5ccd Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Tue, 1 Mar 2022 12:52:29 +0100
Subject: [PATCH] update noamd resources, changelog

---
 CHANGELOG.md                        | 3 ++-
 config/nomad/authorizer.nmd.in      | 2 +-
 config/nomad/broker.nmd.in          | 2 +-
 config/nomad/discovery.nmd.in       | 2 +-
 config/nomad/file_transfer.nmd.in   | 2 +-
 config/nomad/monitoring.nmd.in      | 2 +-
 config/nomad/nginx.nmd.in           | 2 +-
 config/nomad/receiver_fabric.nmd.in | 2 +-
 config/nomad/receiver_kafka.nmd.in  | 2 +-
 config/nomad/receiver_tcp.nmd.in    | 2 +-
 10 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 145802fbf..79f4b08fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,12 +5,13 @@ FEATURES
 
 IMPROVEMENTS
 * renamed and hid C++ macros from client code
+* Consumer API: return kDataNotInCache/AsapoDataNotInCacheError error if data is not in cache and cannot be on disk (due to the ingest mode producer used)
 
 BUG FIXES
 * Producer API: fixed bug segfault in Python code when sending data object which memory is from some other object
 
 INTERNAL
-* Do not return error when memory cache is not allocatable - just write to disk
+* Do not return error when receiver cannot get slot in shared cache - just allocate own memory slot
 
 
 ## 21.12.0
diff --git a/config/nomad/authorizer.nmd.in b/config/nomad/authorizer.nmd.in
index 0943d87b2..a8c06827f 100644
--- a/config/nomad/authorizer.nmd.in
+++ b/config/nomad/authorizer.nmd.in
@@ -15,7 +15,7 @@ job "authorizer" {
       }
 
       resources {
-        cpu    = 500 # 500 MHz
+        cpu    = 50 # 50 MHz
         memory = 256 # 256MB
         network {
           port "authorizer" {
diff --git a/config/nomad/broker.nmd.in b/config/nomad/broker.nmd.in
index 33774f0b4..debdc0880 100644
--- a/config/nomad/broker.nmd.in
+++ b/config/nomad/broker.nmd.in
@@ -15,7 +15,7 @@ job "broker" {
       }
 
       resources {
-        cpu    = 500 # 500 MHz
+        cpu    = 50 # 50 MHz
         memory = 256 # 256MB
         network {
           port "broker" {
diff --git a/config/nomad/discovery.nmd.in b/config/nomad/discovery.nmd.in
index c12361721..d96aa50eb 100644
--- a/config/nomad/discovery.nmd.in
+++ b/config/nomad/discovery.nmd.in
@@ -21,7 +21,7 @@ job "discovery" {
       }
 
       resources {
-        cpu    = 500 # 500 MHz
+        cpu    = 50 # 50 MHz
         memory = 256 # 256MB
       }
 
diff --git a/config/nomad/file_transfer.nmd.in b/config/nomad/file_transfer.nmd.in
index 64f122677..90f1833fe 100644
--- a/config/nomad/file_transfer.nmd.in
+++ b/config/nomad/file_transfer.nmd.in
@@ -15,7 +15,7 @@ job "file_transfer" {
       }
 
       resources {
-        cpu    = 500 # 500 MHz
+        cpu    = 50 # 50 MHz
         memory = 256 # 256MB
         network {
           port "file_transfer" {
diff --git a/config/nomad/monitoring.nmd.in b/config/nomad/monitoring.nmd.in
index dea8287a8..e60d814c3 100644
--- a/config/nomad/monitoring.nmd.in
+++ b/config/nomad/monitoring.nmd.in
@@ -15,7 +15,7 @@ job "monitoring" {
       }
 
       resources {
-        cpu    = 500 # 500 MHz
+        cpu    = 50 # 50 MHz
         memory = 256 # 256MB
         network {
           port "monitoring_server" {
diff --git a/config/nomad/nginx.nmd.in b/config/nomad/nginx.nmd.in
index 97d35ab68..9fa671b26 100644
--- a/config/nomad/nginx.nmd.in
+++ b/config/nomad/nginx.nmd.in
@@ -36,7 +36,7 @@ job "nginx" {
       }
 
       resources {
-        cpu    = 500 # 500 MHz
+        cpu    = 50 # 50 MHz
         memory = 256 # 256MB
       }
 
diff --git a/config/nomad/receiver_fabric.nmd.in b/config/nomad/receiver_fabric.nmd.in
index 938f4cd60..a37759b5f 100644
--- a/config/nomad/receiver_fabric.nmd.in
+++ b/config/nomad/receiver_fabric.nmd.in
@@ -15,7 +15,7 @@ job "receiver" {
       }
 
       resources {
-        cpu    = 500 # 500 MHz
+        cpu    = 50 # 50 MHz
         memory = 256 # 256MB
         network {
           port "recv" {}
diff --git a/config/nomad/receiver_kafka.nmd.in b/config/nomad/receiver_kafka.nmd.in
index 71bfe537d..6b1047d39 100644
--- a/config/nomad/receiver_kafka.nmd.in
+++ b/config/nomad/receiver_kafka.nmd.in
@@ -19,7 +19,7 @@ job "receiver" {
       }
 
       resources {
-        cpu    = 500 # 500 MHz
+        cpu    = 50 # 50 MHz
         memory = 256 # 256MB
         network {
           port "recv" {}
diff --git a/config/nomad/receiver_tcp.nmd.in b/config/nomad/receiver_tcp.nmd.in
index b8a5bb562..dcf9f9176 100644
--- a/config/nomad/receiver_tcp.nmd.in
+++ b/config/nomad/receiver_tcp.nmd.in
@@ -15,7 +15,7 @@ job "receiver" {
       }
 
       resources {
-        cpu    = 500 # 500 MHz
+        cpu    = 50 # 50 MHz
         memory = 256 # 256MB
         network {
           port "recv" {}
-- 
GitLab