Print this page
NEX-5801 Snapshots left over after failed backups
Reviewed by: Rick Mesta <rick.mesta@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Revert "NEX-5801 Snapshots left over after failed backups"
This reverts commit f182fb95f09036db71fbfc6f0a6b90469b761f21.
NEX-5801 Snapshots left over after failed backups
Reviewed by: Rick Mesta <rick.mesta@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
NEX-2911 NDMP logging should use syslog and is too chatty

Split Close
Expand all
Collapse all
          --- old/usr/src/cmd/ndmpd/include/tlm.h
          +++ new/usr/src/cmd/ndmpd/include/tlm.h
   1    1  /*
   2    2   * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
   3    3   * Copyright (c) 2015 by Delphix. All rights reserved.
        4 + * Copyright 2016 Nexenta Systems, Inc. All rights reserved.
   4    5   */
   5    6  
   6    7  /*
   7    8   * BSD 3 Clause License
   8    9   *
   9   10   * Copyright (c) 2007, The Storage Networking Industry Association.
  10   11   *
  11   12   * Redistribution and use in source and binary forms, with or without
  12   13   * modification, are permitted provided that the following conditions
  13   14   * are met:
↓ open down ↓ 35 lines elided ↑ open up ↑
  49   50  #include <fcntl.h>
  50   51  #include <strings.h>
  51   52  #include <sys/stat.h>
  52   53  #include <time.h>
  53   54  #include <sys/queue.h>
  54   55  #include <sys/fs/zfs.h>
  55   56  #include <libzfs.h>
  56   57  
  57   58  #define IS_SET(f, m)    (((f) & (m)) != 0)
  58   59  
  59      -#define TLM_MAX_BACKUP_JOB_NAME 32      /* max size of a job's name */
       60 +#define TLM_MAX_BACKUP_JOB_NAME 16      /* format is 'NdmpBackup.nnnn\0' */
  60   61  #define TLM_TAPE_BUFFERS        10      /* number of rotating tape buffers */
  61   62  #define TLM_LINE_SIZE           128     /* size of text messages */
  62   63  
  63   64  
  64   65  #define TLM_BACKUP_RUN          0x00000001
  65   66  #define TLM_RESTORE_RUN         0x00000002
  66   67  #define TLM_STOP                0x00000009      /* graceful stop */
  67   68  #define TLM_ABORT               0x99999999      /* abandon the run */
  68   69  
  69   70  #define TLM_EXTRA_SPACE         64
↓ open down ↓ 359 lines elided ↑ open up ↑
 429  430          int (*tm_putvol)();     /* Reserved */
 430  431          int (*tm_getfile)();
 431  432          int (*tm_getdir)();
 432  433          int (*tm_getvol)();     /* Reserved */
 433  434  } tm_ops_t;
 434  435  
 435  436  /* The checksum field is filled with this while the checksum is computed. */
 436  437  #define CHKBLANKS       "        "      /* 8 blanks, no null */
 437  438  
 438  439  #define LONGNAME_PREFIX "././_LoNg_NaMe_"
 439      -extern void ndmp_log(ulong_t, char *, char *, ...);
 440      -char ndmp_log_info[256];
 441      -#define NDMP_LOG(p, ...) { \
 442      -                                (void) snprintf(ndmp_log_info, \
 443      -                                    sizeof (ndmp_log_info), \
 444      -                                    "[%d][%s:%d]", \
 445      -                                    (int)pthread_self(), __func__, __LINE__); \
 446      -                                ndmp_log(p, ndmp_log_info, __VA_ARGS__); \
 447      -                        }
 448  440  extern void *ndmp_malloc(size_t size);
 449  441  
 450  442  /*
 451  443   * ZFS metadata plug-in module structures
 452  444   */
 453  445  #define ZFS_MAX_PROPS           100
 454  446  #define ZFS_META_MAGIC          "ZFSMETA"
 455  447  #define ZFS_META_MAGIC_EXT      "ZFSMETA2"
 456  448  
 457  449  /* Add new major/minor for header changes */
↓ open down ↓ 120 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX