Print this page
NEX-13374 NDMP should be able to backup unmounted ZFS filesystems
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
NEX-2911 NDMP logging should use syslog and is too chatty
NEX-1123 NDMP commands can not uniquely identify Nexenta and the file server version (currently 4.0.1) and Sun Microsystems.
NEX-894 Default location of NDMP log file should be under /var/log

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/ndmpd/ndmp/ndmpd_prop.c
          +++ new/usr/src/cmd/ndmpd/ndmp/ndmpd_prop.c
   1    1  /*
   2    2   * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
   3      - * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
        3 + * Copyright 2017 Nexenta Systems, Inc.  All rights reserved.
   4    4   */
   5    5  
   6    6  /*
   7    7   * BSD 3 Clause License
   8    8   *
   9    9   * Copyright (c) 2007, The Storage Networking Industry Association.
  10   10   *
  11   11   * Redistribution and use in source and binary forms, with or without
  12   12   * modification, are permitted provided that the following conditions
  13   13   * are met:
↓ open down ↓ 71 lines elided ↑ open up ↑
  85   85          {"cram-md5-password",           "",     0, NDMP_CF_NOTINIT},
  86   86          {"cleartext-username",          "",     0, NDMP_CF_NOTINIT},
  87   87          {"cleartext-password",          "",     0, NDMP_CF_NOTINIT},
  88   88          {"tcp-port",                    "",     0, NDMP_CF_NOTINIT},
  89   89          {"backup-quarantine",           "",     0, NDMP_CF_NOTINIT},
  90   90          {"restore-quarantine",          "",     0, NDMP_CF_NOTINIT},
  91   91          {"overwrite-quarantine",        "",     0, NDMP_CF_NOTINIT},
  92   92          {"zfs-force-override",          "",     0, NDMP_CF_NOTINIT},
  93   93          {"drive-type",                  "",     0, NDMP_CF_NOTINIT},
  94   94          {"debug-mode",                  "",     0, NDMP_CF_NOTINIT},
       95 +        {"vendor-name",                 "",     0, NDMP_CF_NOTINIT},
       96 +        {"product-name",                "",     0, NDMP_CF_NOTINIT},
       97 +        {"autosync-support",            "",     0, NDMP_CF_NOTINIT},
       98 +        {"hpr-support",                 "",     0, NDMP_CF_NOTINIT},
  95   99  };
  96  100  
  97  101  /*
  98  102   * Loads all the NDMP configuration parameters and sets up the
  99  103   * config table.
 100  104   */
 101  105  int
 102  106  ndmpd_load_prop(void)
 103  107  {
 104  108          ndmpd_cfg_id_t id;
 105  109          ndmpd_cfg_param_t *cfg;
 106  110          char *value;
 107  111  
 108  112          for (id = 0; id < NDMP_MAXALL; id++) {
 109  113                  cfg = &ndmpd_cfg_table[id];
 110  114                  if ((ndmp_get_prop(cfg->sc_name, &value)) == -1) {
 111      -                        syslog(LOG_DEBUG, "%s %s",
      115 +                        syslog(LOG_ERR, "%s %s",
 112  116                              cfg->sc_name, ndmp_strerror(ndmp_errno));
 113  117                          continue;
 114  118                  }
 115  119                  /*
 116  120                   * enval == 0 could mean two things, either the
 117  121                   * config param is not defined, or it has been
 118  122                   * removed. If the variable has already been defined
 119  123                   * and now enval is 0, it should be removed, otherwise
 120  124                   * we don't need to do anything in this case.
 121  125                   */
↓ open down ↓ 103 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX