add more debug log messages

Author: jreadey

src/h5json/hdf5db.py

@@ -381,14 +381,17 @@ def open(self):
         else:
             # open reader first and get root id
             reader_root_id = self.reader.open()
+            self.log.debug(f"got reader root_id:  {reader_root_id}")
+
             if self._root_id:
                 if reader_root_id != self._root_id:
                     raise IOError("reader root id does not match reader root id")
             else:
                 self._root_id = reader_root_id
-
+            self.log.debug("open writer")
             # now open writer
             writer_root_id = self.writer.open()
+            self.log.debug(f"got writer root_id: {writer_root_id}")
             if writer_root_id != self._root_id:
                 raise IOError("writer root id does not match reader root id")
 

src/h5json/hsdsstore/hsds_writer.py

@@ -110,6 +110,7 @@ def __init__(
         self._root_id = None
         self._append = append
         self._track_order = track_order
+        self._owner = owner
         self._linked_domain = linked_domain
         self._last_flush_time = 0
         self._stats = {"created": 0, "lastModified": 0, "owner": ""}
@@ -120,17 +121,24 @@ def open(self):
             # no db set yet
             raise IOError("DB not set")
 
-        if self._http_conn:
-            http_conn = self._http_conn
-        else:
+        if self._http_conn and not self._http_conn.isClosed():
+            return self._root_id
+
+        if not self._http_conn:
             kwargs = self._http_kwargs
             kwargs["retries"] = 1  # tbd: test setting
             http_conn = HttpConn(self.filepath, **kwargs)
             if self._append:
                 http_conn._mode = "a"
+                self.log.debug("hsdswriter - set http_conn mode to a")
             self._http_conn = http_conn
-            hsds_info = http_conn.serverInfo()
-            self.log.debug(f"got hsds info: {hsds_info}")
+
+        http_conn = self._http_conn
+        self.log.debug("hsdswriter - open http conn")
+        http_conn.open()
+
+        hsds_info = self._http_conn.serverInfo()
+        self.log.debug(f"got hsds info: {hsds_info}")
 
         # fetch the domain json
 
@@ -148,6 +156,7 @@ def open(self):
 
         domain_json = None
         rsp = http_conn.GET(req, params=params)
+        self.log.debug(f"hsdswriter initial get status_code: {rsp.status_code}")
 
         if rsp.status_code not in (200, 404, 410):
             msg = f"Got status code: {rsp.status_code} on initial domain get"
@@ -165,6 +174,7 @@ def open(self):
                     raise IOError(404, "Location is a folder, not a file")
             else:
                 # not append - delete existing domain
+                self.log.info("hsds_writer - delete domain")
                 self.log.info(f"sending delete request for {self.filepath}")
                 delete_rsp = http_conn.DELETE(req, params=params)
                 if delete_rsp.status_code not in (200, 410):
@@ -174,6 +184,7 @@ def open(self):
 
         if not domain_json:
             # domain doesn't exist, create it
+            self.log.debug("hsds_writer create domain")
             body = {}
             if self.db.root_id:
                 # initialize domain using the db's root_id
@@ -203,6 +214,7 @@ def open(self):
             raise IOError(404, "Location is a folder, not a file")
 
         root_id = domain_json["root"]
+        self.log.debug("hsds_writer got root_id:", root_id)
 
         self._root_id = root_id
 

src/h5json/hsdsstore/httpconn.py

@@ -682,6 +682,7 @@ def add_external_ref(self, fid):
         self._external_refs.append(fid)
 
     def open(self):
+        self.log.debug("http_conn.open")
         if self._s:
             return  # already open
 
@@ -705,10 +706,12 @@ def open(self):
             kwargs = {"max_retries": retry, "pool_connections": 16, "pool_maxsize": 16}
             s.mount("http://", HTTPAdapter(**kwargs))
             s.mount("https://", HTTPAdapter(**kwargs))
-            self._s = s
+        self.log.debug("Httpconn set self._s")
+        self._s = s
 
     def close(self):
         if self._s:
+            self.log.debug("http_conn.close")
             self._s.close()
             self._s = None
 

test/unit/hsds_writer_test.py

@@ -49,6 +49,7 @@ def testSimple(self):
         for k in ("created", "lastModified", "owner"):
             self.assertTrue(k in stats)
         http_conn = HttpConn(domain_path, mode='r', retries=1)
+        http_conn.open()
 
         db.createAttribute(root_id, "attr1", value=[1, 2, 3, 4])
         db.createAttribute(root_id, "attr2", 42)
@@ -186,6 +187,14 @@ def testReaderWriter(self):
         self.assertTrue(root_id)
         db.reader = HSDSReader(domain_path, app_logger=self.log)
         db.close()
+        """
+        db.writer = HSDSWriter(domain, **kwargs)
+        root_id = db.open()
+        db.close()
+        # now set the reader
+        db.reader = HSDSReader(domain, **kwargs)
+        db.open()
+        """
         root_id2 = db.open()
         self.assertEqual(root_id, root_id2)
         root_json = db.getObjectById(root_id)
@@ -209,6 +218,7 @@ def testH5PyToHS(self):
 
         # validate - get the root group and see if counts are correct
         http_conn = HttpConn(domain_path, mode='r', retries=1)
+        http_conn.open()
         http_rsp = http_conn.GET(f"/groups/{root_id}")
         self.assertEqual(http_rsp.status_code, 200)
         root_json = http_rsp.json()