Ping database in some commands (#435)

`ping`, `hello`, `isMaster` commands now check database connection.
FerretDB · Apr 4, 2022 · a64780c · a64780c
1 parent f65dd0f
commit a64780c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/internal/handlers/pg/msg_hello.go b/internal/handlers/pg/msg_hello.go
@@ -26,6 +26,10 @@ import (
 
 // MsgHello returns a document that describes the role of the instance.
 func (h *Handler) MsgHello(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg, error) {
+	if err := h.pgPool.Ping(ctx); err != nil {
+		return nil, err
+	}
+
 	var reply wire.OpMsg
 	err := reply.SetSections(wire.OpMsgSection{
 		Documents: []*types.Document{must.NotFail(types.NewDocument(

diff --git a/internal/handlers/pg/msg_ismaster.go b/internal/handlers/pg/msg_ismaster.go
@@ -26,6 +26,10 @@ import (
 
 // MsgIsMaster returns a document that describes the role of the instance.
 func (h *Handler) MsgIsMaster(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg, error) {
+	if err := h.pgPool.Ping(ctx); err != nil {
+		return nil, err
+	}
+
 	var reply wire.OpMsg
 	err := reply.SetSections(wire.OpMsgSection{
 		Documents: []*types.Document{must.NotFail(types.NewDocument(

diff --git a/internal/handlers/pg/msg_ping.go b/internal/handlers/pg/msg_ping.go
@@ -24,6 +24,10 @@ import (
 
 // MsgPing OpMsg containing a ping, used to test whether a server is responding to commands.
 func (h *Handler) MsgPing(ctx context.Context, msg *wire.OpMsg) (*wire.OpMsg, error) {
+	if err := h.pgPool.Ping(ctx); err != nil {
+		return nil, err
+	}
+
 	var reply wire.OpMsg
 	err := reply.SetSections(wire.OpMsgSection{
 		Documents: []*types.Document{types.MustNewDocument(