Merge branch 'ckelly_develop' of https://github.com/CODARcode/PerformanceAnalysis into ckelly_develop

Author: giltirn

app/provdb_admin.cpp

@@ -108,6 +108,7 @@ void client_stop_rpc(const tl::request& req) {
 
 margo_instance_id margo_id;
 
+#ifdef ENABLE_MARGO_STATE_DUMP
 void margo_dump(const std::string &stub){
   std::string fn = stub + "." + getDateTimeFileExt();
   progressStream << "ProvDB Admin: margo dump to " << fn << std::endl;
@@ -118,8 +119,7 @@ void margo_dump_rpc(const tl::request& req) {
   const static std::string stub("margo_dump");
   margo_dump(stub);
 }
-
-
+#endif
 
 
 struct ProvdbArgs{
@@ -229,9 +229,10 @@ int main(int argc, char** argv) {
     engine.define("committer_hello",committer_hello).disable_response();
     engine.define("committer_goodbye",committer_goodbye).disable_response();
     engine.define("stop_server",client_stop_rpc).disable_response();
-    engine.define("margo_dump", margo_dump_rpc).disable_response();
     engine.define("connection_status", connection_status);
-
+#ifdef ENABLE_MARGO_STATE_DUMP
+    engine.define("margo_dump", margo_dump_rpc).disable_response();
+#endif
 
     std::string addr = (std::string)engine.self();  //ip and port of admin
 
@@ -325,7 +326,9 @@ int main(int argc, char** argv) {
 	       ( !committer_has_connected || (committer_has_connected && !committer_connected) )
 	       ){
 	      progressStream << "ProvDB Admin: detected all clients disconnected, shutting down" << std::endl;
+#ifdef ENABLE_MARGO_STATE_DUMP
 	      margo_dump("margo_dump_all_client_disconnected");
+#endif
 	      break;
 	    }
 	  }
@@ -338,11 +341,15 @@ int main(int argc, char** argv) {
 	}
 
 	progressStream << "ProvDB Admin: ending admin scope" << std::endl;
+#ifdef ENABLE_MARGO_STATE_DUMP
 	margo_dump("margo_dump_end_admin_scope");
+#endif
       }//admin scope
 
       progressStream << "ProvDB Admin: ending provider scope" << std::endl;
+#ifdef ENABLE_MARGO_STATE_DUMP
       margo_dump("margo_dump_end_provide_scope");
+#endif
     }//provider scope
 
     progressStream << "ProvDB Admin: shutting down server engine" << std::endl;

app/provdb_dump_state.cpp

@@ -4,6 +4,7 @@ using namespace chimbuko;
 
 int main(int argc, char** argv){
 #ifdef ENABLE_PROVDB
+#  ifdef ENABLE_MARGO_STATE_DUMP
   if(argc != 2){
     std::cout << "Usage: provdb_dump_state <server address e.g. ofi+tcp;ofi_rxm://172.17.0.4:5000>" << std::endl;
     return 1;
@@ -14,6 +15,10 @@ int main(int argc, char** argv){
   ad.disconnect();
 
   return 0;
+#  else
+  std::cout << "Margo dump configuration option is disabled" << std::endl;
+  return 1;
+#  endif
 #else
   std::cout << "ProvDB not in use" << std::endl;
   return 1;

configure.ac

@@ -142,6 +142,12 @@ fi
 #AC_ARG_WITH([perf-metric], AS_HELP_STRING([--with-perf-metric], [Specify use of performance metrics]),[AC_DEFINE([_PERF_METRIC],[1],[Use performance metrics])],[])
 AC_ARG_WITH([perf-metric], AS_HELP_STRING([--with-perf-metric], [Specify use of performance metrics]),[PS_FLAGS+=" -D_PERF_METRIC"],[])
 
+#Enable ProvdDB margo state dump (currently requires master branch of margo)
+AC_ARG_ENABLE([margo-state-dump],
+  [AS_HELP_STRING([--enable-margo-state-dump], [Enable ProvdDB margo state dump (currently requires master branch of margo)] )],
+  [AC_DEFINE([ENABLE_MARGO_STATE_DUMP],[1],[Use margo state dump])],
+  [:]
+)
 
 #Check for boost
 AC_ARG_WITH([boost], AS_HELP_STRING([--with-boost], [Specify Boost install directory]),[],[])

docker/ubuntu18.04/openmpi4.0.4/Dockerfile.chimbuko.spack

@@ -0,0 +1,32 @@
+FROM ubuntu:18.04
+
+RUN mkdir -p /Downloads
+
+#Setup a basic set of tools
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && \
+    apt-get install -y tzdata && \
+    ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime && \
+    dpkg-reconfigure --frontend noninteractive tzdata && \
+    apt-get install -y build-essential wget git-core libtool libtool-bin \ 
+                       autoconf gfortran pkg-config \
+		       python3 python3-dev python3-pip python3-tk \
+		       psmisc iproute2 unzip vim gdb emacs-nox && \
+    apt autoremove -y && \
+    rm -rf /var/lib/apt/lists/* 
+
+#Install spack
+WORKDIR /spack
+RUN git clone https://github.com/spack/spack.git
+
+SHELL ["/bin/bash", "-c"]
+
+#Download Chimbuko source and Mochi source to get the repos
+RUN git clone https://github.com/mochi-hpc/mochi-spack-packages.git && \
+    git clone https://github.com/CODARcode/PerformanceAnalysis.git -b ckelly_develop
+
+RUN source /spack/spack/share/spack/setup-env.sh && \
+    spack repo add PerformanceAnalysis/spack/repo/chimbuko && \
+    spack repo add mochi-spack-packages
+
+RUN source /spack/spack/share/spack/setup-env.sh && spack install chimbuko^py-setuptools-scm+toml

include/chimbuko/ad/ADProvenanceDBclient.hpp

@@ -91,8 +91,9 @@ namespace chimbuko{
     thallium::remote_procedure *m_client_hello; /**< RPC to register client with provDB */
     thallium::remote_procedure *m_client_goodbye; /**< RPC to deregister client with provDB */
     thallium::remote_procedure *m_stop_server; /** RPC to shutdown server*/
+#ifdef ENABLE_MARGO_STATE_DUMP
     thallium::remote_procedure *m_margo_dump; /** RPC to request the server dump its state*/
-    
+#endif    
     bool m_perform_handshake; /**< Optionally disable the client->server registration */
 
     PerfStats *m_stats; /**< Performance data gathering*/
@@ -106,7 +107,11 @@ namespace chimbuko{
     void sendMultipleDataAsync(const std::vector<std::string> &entries, const ProvenanceDataType type, OutstandingRequest *req = nullptr) const;
 
   public:
-    ADProvenanceDBclient(int rank): m_is_connected(false), m_rank(rank), m_client_hello(nullptr), m_client_goodbye(nullptr), m_stats(nullptr), m_stop_server(nullptr), m_margo_dump(nullptr), m_perform_handshake(true){}
+    /**
+     * @brief Constructor
+     * @param The rank of the current process
+     */
+    ADProvenanceDBclient(int rank);
 
     ~ADProvenanceDBclient();
 
@@ -242,10 +247,12 @@ namespace chimbuko{
      */
     void stopServer() const;
 
+#ifdef ENABLE_MARGO_STATE_DUMP
     /**
      * @brief Issue an RPC request telling the server to dump its state
      */
     void serverDumpState() const;
+#endif
 
   };
 

spack/environments/summit.yaml

@@ -1,5 +1,6 @@
 spack:
   specs:
+  - py-setuptools-scm+toml
   - adios2@2.7.1 build_type=Debug
   - chimbuko-visualization2
   - chimbuko-performance-analysis@ckelly_develop ^libzmq@4.3.3
@@ -23,9 +24,9 @@ spack:
       flags: {}
       spec: gcc@9.1.0
   repos:
-  #=================== THIS PATH SHOULD BE SET TO POINT TO THE sds-repo DOWNLOADED FROM https://xgitlab.cels.anl.gov/sds/sds-repo 
-  - /autofs/nccs-svm1_home1/ckelly/install/sds/sds-repo
-  #=================== THIS PATH SHOULD BE SET TO POINT TO THE repo/chimbuko SUBDIRECTORY OF THE CHIMBUKO AD SOURCE https://github.com/CODARcode/PerformanceAnalysis/
+  #=================== THIS PATH SHOULD BE SET TO POINT TO THE mochi-spack-packages DOWNLOADED FROM https://github.com/mochi-hpc/mochi-spack-packages.git
+  - /autofs/nccs-svm1_home1/ckelly/install/mochi-spack-packages
+  #=================== THIS PATH SHOULD BE SET TO POINT TO THE repo/chimbuko SUBDIRECTORY OF THE CHIMBUKO AD SOURCE https://github.com/CODARcode/PerformanceAnalysis/ (git clone https://github.com/CODARcode/PerformanceAnalysis.git)
   - /autofs/nccs-svm1_home1/ckelly/src/AD/PerformanceAnalysis/spack/repo/chimbuko
   packages:
     all:

spack/repo/chimbuko/packages/chimbuko/package.py

@@ -0,0 +1,37 @@
+# Copyright 2013-2021 Lawrence Livermore National Security, LLC and other
+# Spack Project Developers. See the top-level COPYRIGHT file for details.
+#
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+# ----------------------------------------------------------------------------
+# If you submit this package back to Spack as a pull request,
+# please first remove this boilerplate and all FIXME comments.
+#
+# This is a template package file for Spack.  We've put "FIXME"
+# next to all the things you'll want to change. Once you've handled
+# them, you can save this file and test your package like this:
+#
+#     spack install chimbuko
+#
+# You can edit this file again by typing:
+#
+#     spack edit chimbuko
+#
+# See the Spack documentation for more information on packaging.
+# ----------------------------------------------------------------------------
+
+from spack import *
+
+
+class Chimbuko(BundlePackage):
+    """A bundle package for the Chimbuko Performance Analysis software."""
+
+    homepage = "https://github.com/CODARcode/Chimbuko"
+
+    maintainers = ['giltirn', 'sandeepmittal']
+
+    version('main')
+
+    depends_on('chimbuko-performance-analysis')
+    depends_on('chimbuko-visualization2')
+

spack/repo/chimbuko/packages/py-flask-sqlalchemy/package.py

@@ -12,7 +12,8 @@ class PyFlaskSqlalchemy(PythonPackage):
     homepage = "https://github.com/pallets/flask-sqlalchemy"
     git = "https://github.com/pallets/flask-sqlalchemy"
 
-    version('master', branch='master')
+    #version('master', branch='master')
+    version('main', branch='main')
 
     depends_on('py-setuptools', type='build')
     depends_on('py-flask@1.0.4:', type=('build', 'run'))

src/ad/ADProvenanceDBclient.cpp

@@ -72,6 +72,12 @@ static void delete_rpc(thallium::remote_procedure* &rpc){
   delete rpc; rpc = nullptr;
 }
 
+ADProvenanceDBclient::ADProvenanceDBclient(int rank): m_is_connected(false), m_rank(rank), m_client_hello(nullptr), m_client_goodbye(nullptr), m_stats(nullptr), m_stop_server(nullptr), m_perform_handshake(true)
+#ifdef ENABLE_MARGO_STATE_DUMP
+    , m_margo_dump(nullptr)
+#endif
+    {}
+
 
 void ADProvenanceDBclient::disconnect(){
   if(m_is_connected){
@@ -90,8 +96,9 @@ void ADProvenanceDBclient::disconnect(){
       delete_rpc(m_client_goodbye);
     }
     delete_rpc(m_stop_server);
+#ifdef ENABLE_MARGO_STATE_DUMP
     delete_rpc(m_margo_dump);
-
+#endif
     m_is_connected = false;
     verboseStream << "ADProvenanceDBclient disconnected" << std::endl;
   }
@@ -153,7 +160,9 @@ void ADProvenanceDBclient::connect(const std::string &addr, const int nshards){
     }      
 
     m_stop_server = new thallium::remote_procedure(eng.define("stop_server").disable_response());
+#ifdef ENABLE_MARGO_STATE_DUMP
     m_margo_dump = new thallium::remote_procedure(eng.define("margo_dump").disable_response());
+#endif
 
     m_is_connected = true;
     verboseStream << "DB client rank " << m_rank << " connected successfully to database" << std::endl;
@@ -355,11 +364,12 @@ void ADProvenanceDBclient::stopServer() const{
   m_stop_server->on(m_server)();
 }
 
+#ifdef ENABLE_MARGO_STATE_DUMP
 void ADProvenanceDBclient::serverDumpState() const{
   verboseStream << "ADProvenanceDBclient requesting server dump its state" << std::endl;
   m_margo_dump->on(m_server)();
 }
-
+#endif
 
 #endif
 

test/mainProvDBclient.cpp

@@ -332,6 +332,7 @@ bool fileExistsMatchingRegex(const std::string &dir, const std::regex &regex){
   return false;
 }
 
+#ifdef ENABLE_MARGO_STATE_DUMP
 TEST(ADProvenanceDBclientTest, TestStateDump){
   if(rank == 0){
     std::regex fn(R"(margo_dump\.)");
@@ -360,7 +361,7 @@ TEST(ADProvenanceDBclientTest, TestStateDump){
     EXPECT_EQ(fail, false);
   }
 }
-
+#endif
 
 
 int main(int argc, char** argv)