Overview
| Comment: | Removed need for watchdog |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.6584-nanomsg |
| Files: | files | file ages | folders |
| SHA1: |
b1c8817ecfae98f7bbbe12ccef509cf9 |
| User & Date: | matt on 2021-06-18 05:05:42 |
| Other Links: | branch diff | manifest | tags |
Context
|
2021-06-18
| ||
| 05:44 | wip to clean up server shutdown process check-in: e75192ae30 user: matt tags: v1.6584-nanomsg | |
| 05:05 | Removed need for watchdog check-in: b1c8817ecf user: matt tags: v1.6584-nanomsg | |
|
2021-06-15
| ||
| 05:37 | sync-inmem fixes check-in: 38fe57c824 user: matt tags: v1.6584-nanomsg | |
Changes
Modified launchmod.scm from [60133fcc07] to [65d455bb82].
| ︙ | ︙ | |||
2290 2291 2292 2293 2294 2295 2296 |
(apath *toppath*))
(let loop ()
(thread-sleep! 5) ;; add control / setting for this
(if am-server
(if (not *dbstruct-db*) ;; skip syncing until db is setup
(loop)
(begin
| | | | 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 |
(apath *toppath*))
(let loop ()
(thread-sleep! 5) ;; add control / setting for this
(if am-server
(if (not *dbstruct-db*) ;; skip syncing until db is setup
(loop)
(begin
;; (debug:print-info 0 *default-log-port* "syncing "apath" "dbfile" at "(current-seconds))
;; (db:sync-inmem->disk *dbstruct-db* apath dbfile)
(loop)))))))
;;
;; (let ((dbstruct
;; (debug:print-info 13 *default-log-port* "after db:setup with dbstruct=" dbstruct)
;; (cond
;; ((dbr:dbstruct-read-only dbstruct)
|
| ︙ | ︙ |
Modified rmtmod.scm from [4daf554596] to [be3b150966].
| ︙ | ︙ | |||
2059 2060 2061 2062 2063 2064 2065 |
;; main and run db servers have both got wait logic (could/should merge it)
(if is-main
(http-transport:wait-for-server pkts-dir dbname server-key)
(http-transport:wait-for-stable-interface))
;; this is our forever loop
(let* ((iface (servdat-host *server-info*))
(port (servdat-port *server-info*)))
| | | 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 |
;; main and run db servers have both got wait logic (could/should merge it)
(if is-main
(http-transport:wait-for-server pkts-dir dbname server-key)
(http-transport:wait-for-stable-interface))
;; this is our forever loop
(let* ((iface (servdat-host *server-info*))
(port (servdat-port *server-info*)))
(let loop ((count 0)
(bad-sync-count 0)
(start-time (current-milliseconds)))
(if (and (not is-main)
(common:low-noise-print 60 "servdat-status"))
(debug:print-info 0 *default-log-port* "servdat-status is " (servdat-status *server-info*)))
|
| ︙ | ︙ | |||
2088 2089 2090 2091 2092 2093 2094 | (begin (debug:print 0 *default-log-port* "We are not the server for "dbname", exiting.") (exit))))) (debug:print 0 *default-log-port* "SERVER: running, db "dbname" opened, megatest version: " (common:get-full-version)) ;; start the watchdog | > > > | | > > > > > | 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 | (begin (debug:print 0 *default-log-port* "We are not the server for "dbname", exiting.") (exit))))) (debug:print 0 *default-log-port* "SERVER: running, db "dbname" opened, megatest version: " (common:get-full-version)) ;; start the watchdog ;; is this really needed? #;(if watchdog (if (not (member (thread-state watchdog) '(ready running blocked sleeping dead))) (begin (debug:print-info 0 *default-log-port* "Starting watchdog thread (in state "(thread-state watchdog)")") (thread-start! watchdog)) (debug:print-info 0 *default-log-port* "Not starting watchdog thread (in state "(thread-state watchdog)")")) (debug:print 0 *default-log-port* "ERROR: *watchdog* not setup, cannot start it.")) #;(loop (+ count 1) bad-sync-count start-time) )) (debug:print-info 0 *default-log-port* "syncing "*toppath*" "dbname" at "(current-seconds)) (db:sync-inmem->disk *dbstruct-db* *toppath* dbname) (mutex-unlock! *heartbeat-mutex*) ;; when things go wrong we don't want to be doing the various ;; queries too often so we strive to run this stuff only every ;; four seconds or so. (let* ((sync-time (- (current-milliseconds) start-time)) (rem-time (quotient (- 4000 sync-time) 1000))) |
| ︙ | ︙ |