From 7851fa1e09ede4a3f7091e705e236f6a087595ff Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Wed, 19 Sep 2018 15:38:35 +0200
Subject: [PATCH] update nomad jobs, more debug out for windows

---
 .../src/shared_event_list.cpp                 |  2 +
 .../src/single_folder_watch_windows.cpp       |  3 ++
 .../asapo-test_filegen_filemon.nomad          | 42 ++++++++++---------
 ...apo-test_filemon_producer_toreceiver.nomad |  2 +-
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/producer/event_monitor_producer/src/shared_event_list.cpp b/producer/event_monitor_producer/src/shared_event_list.cpp
index 8787ead85..286165cd7 100644
--- a/producer/event_monitor_producer/src/shared_event_list.cpp
+++ b/producer/event_monitor_producer/src/shared_event_list.cpp
@@ -1,4 +1,5 @@
 #include "shared_event_list.h"
+#include "eventmon_logger.h"
 
 #include <algorithm>
 
@@ -13,6 +14,7 @@ FilesToSend SharedEventList::GetAndClearEvents() {
         uint64_t elapsed_ms = std::chrono::duration_cast<std::chrono::milliseconds>( high_resolution_clock::now() -
                               it->time).count();
         if (!it->apply_delay || elapsed_ms > kFileDelayMs) {
+            GetDefaultEventMonLogger()->Debug("file considered closed or file moved: " + it->file_name);
             events.push_back(it->file_name);
             it = events_.erase(it);
         } else {
diff --git a/producer/event_monitor_producer/src/single_folder_watch_windows.cpp b/producer/event_monitor_producer/src/single_folder_watch_windows.cpp
index 8f0010fab..0453c4ea9 100644
--- a/producer/event_monitor_producer/src/single_folder_watch_windows.cpp
+++ b/producer/event_monitor_producer/src/single_folder_watch_windows.cpp
@@ -27,6 +27,7 @@ Error SingleFolderWatch::Init()  {
         this->log__->Error("cannot add folder watch for " + full_path + ": " + err->Explain());
         return err;
     }
+    GetDefaultEventMonLogger()->Debug("added folder to monitor: " + full_path);
     return nullptr;
 }
 
@@ -53,9 +54,11 @@ Error SingleFolderWatch::ProcessEvent(const WinEvent& event) {
     if (watch_io__->IsDirectory(root_folder_ + kPathSeparator + fname)) {
         return nullptr;
     }
+    GetDefaultEventMonLogger()->Debug("file modified event: " + fname);
     event_list_->AddEvent(fname, event.ShouldBeProcessedAfterDelay());
     return nullptr;
 }
+
 void SingleFolderWatch::ProcessEvents(DWORD bytes_to_read) {
     for (char* p = buffer_.get(); p < buffer_.get() + bytes_to_read; ) {
         WinEvent event{(FILE_NOTIFY_INFORMATION*) p};
diff --git a/tests/manual/tests_via_nomad/asapo-test_filegen_filemon.nomad b/tests/manual/tests_via_nomad/asapo-test_filegen_filemon.nomad
index c5181c44b..6ea2313dc 100644
--- a/tests/manual/tests_via_nomad/asapo-test_filegen_filemon.nomad
+++ b/tests/manual/tests_via_nomad/asapo-test_filegen_filemon.nomad
@@ -20,9 +20,10 @@ job "asapo-test" {
         command = "local/filegen_win.exe"
         args = [
           "1",
-          "1M",
-          "10",
-          "c:/tmp/asapo/test_in/test_folder/file_win"]
+          "10M",
+          "10000",
+          "120",
+          "u:/asapo/test_folder/file_win"]
       }
 
       artifact {
@@ -57,9 +58,10 @@ job "asapo-test" {
         command = "local/filegen_linux"
         args = [
           "1",
-          "1M",
-          "10",
-          "/tmp/asapo/test_in/test_folder/file_lin_"]
+          "10M",
+          "10000",
+          "120",
+          "/tmp/asapo/test_in/test_folder/file_lin"]
       }
 
       artifact {
@@ -100,13 +102,13 @@ job "asapo-test" {
           "30000"]
       }
 
-      resources {
-        cpu = 5000
-        memory = 128
-        network {
-          mbits = 10000
-        }
-      }
+#      resources {
+#        cpu = 5000
+#        memory = 128
+#        network {
+#          mbits = 10000
+#        }
+#      }
 
       artifact {
         source = "http://nims.desy.de/extra/asapo/getnext_broker"
@@ -144,13 +146,13 @@ job "asapo-test" {
           "yzgAcLmijSLWIm8dBiGNCbc0i42u5HSm-zR6FRqo__Y=",
           "30000"]
       }
-      resources {
-        cpu = 5000
-        memory = 128
-        network {
-          mbits = 10000
-        }
-      }
+#      resources {
+#        cpu = 5000
+#        memory = 128
+#        network {
+#          mbits = 10000
+#        }
+#      }
 
       artifact {
         source = "http://nims.desy.de/extra/asapo/getnext_broker"
diff --git a/tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad b/tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad
index eb22e67a0..fcde0f344 100644
--- a/tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad
+++ b/tests/manual/tests_via_nomad/asapo-test_filemon_producer_toreceiver.nomad
@@ -36,7 +36,7 @@ job "asapo-filemon-producer" {
  "Mode":"tcp",
  "NThreads":8,
  "LogLevel":"debug",
- "RootMonitoredFolder":"c:\\tmp\\asapo\\test_in",
+ "RootMonitoredFolder":"u:\\asapo",
  "MonitoredSubFolders":["test_folder"],
  "IgnoreExtentions":["tmp"],
  "RemoveAfterSend":true
-- 
GitLab