wl#9819 patch #1 : NDBD angel process reports its process id to kernel process

Author: jdduncan

storage/ndb/src/kernel/angel.cpp

@@ -668,6 +668,9 @@ angel_run(const char* progname,
     one_arg.assfmt("--nostart=%d", no_start);
     args.push_back(one_arg);
 
+    one_arg.assfmt("--angel-pid=%d", getpid());
+    args.push_back(one_arg);
+
     pid_t child = retry_spawn_process(progname, args);
     if (child <= 0)
     {

storage/ndb/src/kernel/main.cpp

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -39,6 +39,7 @@ static int opt_report_fd;
 static int opt_initial;
 static int opt_no_start;
 static unsigned opt_allocated_nodeid;
+static int opt_angel_pid;
 static int opt_retries;
 static int opt_delay;
 
@@ -93,6 +94,10 @@ static struct my_option my_long_options[] =
     "INTERNAL: nodeid allocated by angel process",
     (uchar**) &opt_allocated_nodeid, (uchar**) &opt_allocated_nodeid, 0,
     GET_UINT, REQUIRED_ARG, 0, 0, UINT_MAX, 0, 0, 0 },
+  { "angel-pid", NDB_OPT_NOSHORT,
+    "INTERNAL: angel process id",
+    (uchar**) &opt_angel_pid, (uchar **) &opt_angel_pid, 0,
+    GET_UINT, REQUIRED_ARG, 0, 0, UINT_MAX, 0, 0, 0 },
   { "connect-retries", 'r',
     "Number of times mgmd is contacted at start. -1: eternal retries",
     (uchar**) &opt_retries, (uchar**) &opt_retries, 0,