From 908807bd59d8fa76bf4db51b4ca64466fba65ae1 Mon Sep 17 00:00:00 2001 From: Christian Schwarz Date: Fri, 18 Oct 2024 19:21:17 +0200 Subject: [PATCH] move implementation to `internal/` directory (#828) --- Makefile | 8 ++--- docs/conf.py | 2 +- docs/quickstart/backup_to_external_disk.rst | 6 ++-- docs/quickstart/continuous_server_backup.rst | 4 +-- docs/quickstart/fan_out_replication.rst | 4 +-- {cli => internal/cli}/cli.go | 4 +-- {client => internal/client}/configcheck.go | 10 +++--- {client => internal/client}/jsonclient.go | 0 {client => internal/client}/migrate.go | 10 +++--- {client => internal/client}/migrate_test.go | 0 {client => internal/client}/pprof.go | 2 +- .../client}/pprof_activity_trace.go | 2 +- {client => internal/client}/pprof_listen.go | 6 ++-- {client => internal/client}/signal.go | 6 ++-- .../client}/status/client/client.go | 2 +- {client => internal/client}/status/status.go | 10 +++--- .../client}/status/status_dump.go | 2 +- .../client}/status/status_interactive.go | 2 +- .../client}/status/status_legacy.go | 2 +- .../client}/status/status_raw.go | 0 .../status/viewmodel/bytecountbinary.go | 0 .../status/viewmodel/bytesprogresshistory.go | 0 .../client}/status/viewmodel/render.go | 12 +++---- .../viewmodel/stringbuilder/stringbuilder.go | 0 {client => internal/client}/stdinserver.go | 4 +-- {client => internal/client}/testcmd.go | 8 ++--- {client => internal/client}/version.go | 8 ++--- .../client}/zfsabstractions.go | 8 ++--- .../client}/zfsabstractions_create.go | 2 +- .../zfsabstractions_create_step_hold.go | 6 ++-- .../client}/zfsabstractions_list.go | 6 ++-- .../client}/zfsabstractions_release.go | 4 +-- {config => internal/config}/config.go | 4 +-- .../config}/config_dep_test.go | 0 .../config}/config_duration.go | 0 .../config}/config_global_test.go | 0 .../config}/config_jobid_test.go | 0 .../config}/config_minimal_test.go | 0 .../config_positiveintervalormanual_test.go | 0 .../config}/config_recv_test.go | 2 +- .../config}/config_send_test.go | 0 .../config}/config_snapshotting_test.go | 0 {config => internal/config}/config_test.go | 2 +- .../config}/config_transport_test.go | 0 {config => internal/config}/retentiongrid.go | 0 .../config}/samples/bandwidth_limit.yml | 0 {config => internal/config}/samples/empty.yml | 0 .../config}/samples/hooks/template.sh | 0 {config => internal/config}/samples/local.yml | 0 {config => internal/config}/samples/pull.yml | 0 .../config}/samples/pull_ssh.yml | 0 {config => internal/config}/samples/push.yml | 0 .../quickstart_backup_to_external_disk.yml | 0 ...tart_continuous_server_backup_receiver.yml | 0 ...kstart_continuous_server_backup_sender.yml | 0 .../quickstart_fan_out_replication_source.yml | 0 .../quickstart_fan_out_replication_target.yml | 0 {config => internal/config}/samples/sink.yml | 0 {config => internal/config}/samples/snap.yml | 0 .../config}/samples/snap_cron.yml | 0 .../config}/samples/source.yml | 0 .../config}/samples/source_ssh.yml | 0 {daemon => internal/daemon}/control.go | 16 +++++----- {daemon => internal/daemon}/daemon.go | 22 ++++++------- .../daemon}/filters/fsmapfilter.go | 4 +-- .../daemon}/filters/fsmapfilter_test.go | 2 +- .../daemon}/hooks/edge_string.go | 0 .../daemon}/hooks/hook_config.go | 4 +-- .../daemon}/hooks/hook_docs.go | 0 .../daemon}/hooks/hook_exec.go | 2 +- .../daemon}/hooks/hook_logging.go | 6 ++-- .../daemon}/hooks/hook_type_callback.go | 4 +-- .../daemon}/hooks/hook_type_command.go | 10 +++--- .../hooks/hook_type_mysql_lock_tables.go | 6 ++-- .../hooks/hook_type_postgres_checkpoint.go | 6 ++-- .../daemon}/hooks/hooks_test.go | 12 +++---- .../daemon}/hooks/stepstatus_enumer.go | 0 .../daemon}/hooks/test/test-error.sh | 0 .../daemon}/hooks/test/test-large-stdout.sh | 0 .../daemon}/hooks/test/test-post-error.sh | 0 .../hooks/test/test-pre-error-post-ok.sh | 0 .../daemon}/hooks/test/test-report-env.sh | 0 .../daemon}/hooks/test/test-timeout.sh | 0 {daemon => internal/daemon}/job/active.go | 32 +++++++++---------- .../daemon}/job/active_test.go | 4 +-- .../daemon}/job/activesidestate_enumer.go | 0 {daemon => internal/daemon}/job/build_jobs.go | 4 +-- .../daemon}/job/build_jobs_sendrecvoptions.go | 10 +++--- .../daemon}/job/build_jobs_test.go | 4 +-- {daemon => internal/daemon}/job/job.go | 8 ++--- {daemon => internal/daemon}/job/passive.go | 18 +++++------ .../daemon}/job/reset/reset.go | 0 {daemon => internal/daemon}/job/snapjob.go | 22 ++++++------- .../daemon}/job/wakeup/wakeup.go | 0 .../daemon}/logging/build_logging.go | 8 ++--- .../daemon}/logging/logging_context.go | 0 .../daemon}/logging/logging_formatters.go | 2 +- .../daemon}/logging/logging_outlets.go | 2 +- .../daemon}/logging/trace/trace.go | 2 +- .../daemon}/logging/trace/trace_callback.go | 2 +- .../logging/trace/trace_chrometrace.go | 2 +- .../daemon}/logging/trace/trace_context.go | 0 .../logging/trace/trace_convenience.go | 0 .../logging/trace/trace_convenience_test.go | 2 +- .../daemon}/logging/trace/trace_debug.go | 2 +- .../daemon}/logging/trace/trace_genID.go | 2 +- .../daemon}/logging/trace/trace_test.go | 0 .../trace_unique_concurrent_task_namer.go | 0 ...trace_unique_concurrent_task_namer_test.go | 0 {daemon => internal/daemon}/main.go | 4 +-- .../daemon}/nethelpers/helpers.go | 0 {daemon => internal/daemon}/pprof.go | 4 +-- {daemon => internal/daemon}/prometheus.go | 16 +++++----- {daemon => internal/daemon}/pruner/pruner.go | 12 +++---- .../daemon}/pruner/pruner_queue.go | 0 .../daemon}/pruner/state_enumer.go | 0 {daemon => internal/daemon}/snapper/cron.go | 10 +++--- .../daemon}/snapper/cron_test.go | 2 +- {daemon => internal/daemon}/snapper/impl.go | 10 +++--- {daemon => internal/daemon}/snapper/manual.go | 0 .../daemon}/snapper/periodic.go | 16 +++++----- .../daemon}/snapper/snapname/snapname.go | 4 +-- .../snapper/snapname/timestamp/timestamp.go | 0 .../snapname/timestamp/timestamp_test.go | 0 .../daemon}/snapper/snapper.go | 4 +-- .../daemon}/snapper/snapstate_string.go | 0 .../daemon}/snapper/state_string.go | 0 {daemon => internal/daemon}/snapper/util.go | 4 +-- {endpoint => internal/endpoint}/context.go | 4 +-- {endpoint => internal/endpoint}/endpoint.go | 18 +++++------ .../endpoint}/endpoint_abstractions_cache.go | 4 +-- .../endpoint}/endpoint_guarantees.go | 4 +-- .../endpoint}/endpoint_metrics.go | 0 .../endpoint}/endpoint_zfs_abstraction.go | 10 +++--- ...oint_zfs_abstraction_last_received_hold.go | 2 +- ...oint_zfs_abstraction_replication_cursor.go | 2 +- .../endpoint_zfs_abstraction_step_hold.go | 2 +- .../endpoint_zfs_abstraction_test.go | 2 +- .../endpoint}/endpoint_zfs_helpers_repr.go | 2 +- .../endpoint_zfs_helpers_repr_test.go | 0 .../endpoint}/endpoint_zfs_helpers_types.go | 2 +- {endpoint => internal/endpoint}/jobid.go | 2 +- ...holdercreationencryptionproperty_enumer.go | 0 .../replicationguaranteekind_enumer.go | 0 {logger => internal/logger}/datastructures.go | 0 {logger => internal/logger}/logger.go | 0 {logger => internal/logger}/logger_test.go | 2 +- {logger => internal/logger}/nulllogger.go | 0 {logger => internal/logger}/stderrlogger.go | 0 {logger => internal/logger}/testlogger.go | 0 .../platformtest}/harness/harness.go | 12 +++---- .../platformtest}/harness/harness_test.go | 0 .../platformtest}/logmockzfs/logzfsenv | 0 .../platformtest}/logmockzfs/zfs | 0 .../platformtest}/platformtest.go | 0 .../platformtest}/platformtest_exec.go | 2 +- .../platformtest}/platformtest_logging.go | 4 +-- .../platformtest}/platformtest_ops.go | 0 .../platformtest}/platformtest_parser_test.go | 0 .../platformtest}/platformtest_zpool.go | 2 +- .../platformtest}/tests/batchDestroy.go | 4 +-- .../platformtest}/tests/gen/gen.go | 0 .../platformtest}/tests/generated_cases.go | 0 .../platformtest}/tests/getNonexistent.go | 4 +-- .../platformtest}/tests/helpers.go | 8 ++--- .../platformtest}/tests/holds.go | 4 +-- .../platformtest}/tests/idempotentBookmark.go | 4 +-- .../platformtest}/tests/idempotentDestroy.go | 4 +-- .../platformtest}/tests/idempotentHold.go | 4 +-- .../tests/listFilesystemVersions.go | 4 +-- .../platformtest}/tests/listFilesystems.go | 4 +-- .../tests/recvForceIntoEncryptedErr.go | 6 ++-- .../platformtest}/tests/recvRollback.go | 6 ++-- .../platformtest}/tests/replication.go | 26 +++++++-------- .../platformtest}/tests/replicationCursor.go | 6 ++-- .../tests/resumableRecvAndTokenHandling.go | 6 ++-- .../platformtest}/tests/resumeTokenParsing.go | 4 +-- .../tests/resumeTokensGenerate.bash | 0 .../platformtest}/tests/sendArgsValidation.go | 14 ++++---- .../platformtest}/tests/sendStream.go | 6 ++-- .../platformtest}/tests/tests.go | 2 +- .../tests/undestroyableSnapshotParsing.go | 4 +-- {pruning => internal/pruning}/keep_grid.go | 4 +-- {pruning => internal/pruning}/keep_helpers.go | 0 .../pruning}/keep_helpers_test.go | 0 {pruning => internal/pruning}/keep_last_n.go | 0 .../pruning}/keep_last_n_test.go | 0 .../pruning}/keep_not_replicated.go | 0 .../pruning}/keep_not_replicated_test.go | 0 {pruning => internal/pruning}/keep_regex.go | 0 .../pruning}/keep_regex_test.go | 0 {pruning => internal/pruning}/pruning.go | 2 +- {pruning => internal/pruning}/pruning_test.go | 0 .../pruning}/retentiongrid/retentiongrid.go | 0 .../retentiongrid/retentiongrid_test.go | 0 .../replication}/design.md | 0 .../replication}/driver/errorclass_enumer.go | 0 .../replication}/driver/replication_driver.go | 8 ++--- .../driver/replication_driver_debug.go | 0 .../driver/replication_driver_logging.go | 4 +-- .../driver/replication_driver_test.go | 4 +-- .../driver/replication_stepqueue.go | 4 +-- .../driver/replication_stepqueue_test.go | 4 +-- .../replication}/logic/diff/diff.go | 2 +- .../replication}/logic/diff/diff_test.go | 2 +- ...initialreplicationautoresolution_enumer.go | 0 .../replication}/logic/pdu/pdu.pb.go | 0 .../replication}/logic/pdu/pdu.proto | 0 .../replication}/logic/pdu/pdu_extras.go | 2 +- .../replication}/logic/pdu/pdu_grpc.pb.go | 0 .../replication}/logic/pdu/pdu_test.go | 0 .../replication}/logic/replication_logic.go | 20 ++++++------ .../logic/replication_logic_context.go | 4 +-- .../logic/replication_logic_policy.go | 4 +-- .../replication}/replication.go | 2 +- .../replication}/report/replication_report.go | 0 .../dataconn/base2bufpool/base2bufpool.go | 0 .../base2bufpool/base2bufpool_test.go | 0 .../base2bufpool/nofitbehavior_enumer.go | 0 .../rpc}/dataconn/dataconn_client.go | 6 ++-- .../rpc}/dataconn/dataconn_debug.go | 0 .../rpc}/dataconn/dataconn_server.go | 8 ++--- .../rpc}/dataconn/dataconn_shared.go | 0 .../rpc}/dataconn/dataconn_test.go | 0 .../rpc}/dataconn/frameconn/frameconn.go | 4 +-- .../frameconn/frameconn_prometheus.go | 0 .../frameconn/frameconn_shutdown_fsm.go | 0 .../rpc}/dataconn/frameconn/frameconn_test.go | 0 .../dataconn/heartbeatconn/heartbeatconn.go | 4 +-- .../heartbeatconn/heartbeatconn_debug.go | 0 .../heartbeatconn/heartbeatconn_test.go | 2 +- ...eatconn_integration_variablereceiverate.go | 4 +-- .../dataconn/microbenchmark/microbenchmark.go | 12 +++---- .../rpc}/dataconn/stream/stream.go | 8 ++--- .../rpc}/dataconn/stream/stream_conn.go | 4 +-- .../rpc}/dataconn/stream/stream_debug.go | 0 .../rpc}/dataconn/stream/stream_test.go | 6 ++-- .../internal/wireevaluator/testbed/.gitignore | 0 .../internal/wireevaluator/testbed/README.md | 0 .../internal/wireevaluator/testbed/all.yml | 0 .../wireevaluator/testbed/gen_files.sh | 0 .../internal_prepare_and_run_repeated.yml | 0 .../internal_run_test_prepared_single.yml | 0 .../wireevaluator/testbed/inventory.example | 0 .../testbed/templates/ssh.yml.j2 | 0 .../testbed/templates/tcp.yml.j2 | 0 .../testbed/templates/tls.yml.j2 | 0 .../internal/wireevaluator/wireevaluator.go | 6 ++-- .../wireevaluator/wireevaluator_closewrite.go | 2 +- .../wireevaluator/wireevaluator_deadlines.go | 2 +- .../rpc}/dataconn/timeoutconn/timeoutconn.go | 0 .../timeoutconn_readv_unsupported.go | 0 .../dataconn/timeoutconn/timeoutconn_test.go | 4 +-- .../dataconn/timeoutconn/timoutconn_readv.go | 0 .../authlistener_grpc_adaptor.go | 4 +-- .../grpcclientidentity/example/grpcauth.proto | 0 .../rpc}/grpcclientidentity/example/main.go | 10 +++--- .../example/pdu/grpcauth.pb.go | 0 .../example/pdu/grpcauth_grpc.pb.go | 0 .../authlistener_grpc_adaptor_wrapper.go | 8 ++--- .../authlistener_netlistener_adaptor.go | 4 +-- {rpc => internal/rpc}/rpc_client.go | 16 +++++----- {rpc => internal/rpc}/rpc_debug.go | 0 {rpc => internal/rpc}/rpc_doc.go | 0 {rpc => internal/rpc}/rpc_logging.go | 4 +-- {rpc => internal/rpc}/rpc_mux.go | 6 ++-- {rpc => internal/rpc}/rpc_server.go | 16 +++++----- .../rpc}/transportmux/transportmux.go | 6 ++-- .../rpc}/versionhandshake/versionhandshake.go | 0 .../versionhandshake/versionhandshake_test.go | 2 +- .../versionhandshake_transport_wrappers.go | 2 +- {tlsconf => internal/tlsconf}/tlsconf.go | 0 .../fromconfig/transport_fromconfig.go | 12 +++---- .../transport}/local/connect_local.go | 4 +-- .../transport}/local/serve_local.go | 6 ++-- .../transport}/ssh/connect_ssh.go | 4 +-- .../transport}/ssh/serve_stdinserver.go | 6 ++-- .../transport}/tcp/connect_tcp.go | 4 +-- .../transport}/tcp/serve_tcp.go | 6 ++-- .../transport}/tcp/serve_tcp_ipmap.go | 2 +- .../transport}/tcp/serve_tcp_ipmap_test.go | 0 .../transport}/tls/connect_tls.go | 6 ++-- .../transport}/tls/serve_tls.go | 8 ++--- .../transport}/tls/tls_wire_adaptor.go | 0 .../transport}/transport.go | 8 ++--- .../util}/bandwidthlimit/bandwidthlimit.go | 0 .../bandwidthlimit/bandwidthlimit_test.go | 0 .../bytecounter/bytecounter_readcloser.go | 0 .../util}/chainedio/chainedio_readcloser.go | 0 .../util}/chainlock/chainlock.go | 0 {util => internal/util}/choices/choices.go | 0 .../util}/choices/choices_test.go | 2 +- {util => internal/util}/chunking/chunking.go | 0 .../util}/chunking/chunking_test.go | 0 {util => internal/util}/circlog/circlog.go | 0 .../util}/circlog/circlog_test.go | 2 +- .../util}/circlog/nextpow2int_test.go | 0 .../util}/connlogger/connlogger.go | 0 .../util}/datasizeunit/datasizeunit.go | 0 .../util}/datasizeunit/datasizeunit_test.go | 0 {util => internal/util}/devnoop/devnoop.go | 0 {util => internal/util}/envconst/envconst.go | 0 .../util}/envconst/envconst_test.go | 2 +- .../util}/errorarray/errorarray.go | 0 .../util}/iocommand/iocommand.go | 2 +- {util => internal/util}/limitio/limitio.go | 0 .../util}/limitio/limitio_readcloser_test.go | 0 .../util}/nodefault/nodefault.go | 0 .../util}/nodefault/nodefault_bool.go | 0 .../optionaldeadline/optionaldeadline.go | 0 .../optionaldeadline/optionaldeadline_test.go | 4 +-- .../util}/semaphore/semaphore.go | 2 +- .../util}/semaphore/semaphore_test.go | 2 +- .../util}/socketpair/socketpair.go | 0 .../util}/socketpair/socketpair_test.go | 0 .../suspendresumesafetimer.go | 2 +- {util => internal/util}/tcpsock/tcpsock.go | 0 .../util}/tcpsock/tcpsock_freebind_freebsd.go | 0 .../util}/tcpsock/tcpsock_freebind_linux.go | 0 .../tcpsock/tcpsock_freebind_unsupported.go | 0 .../util}/zreplcircleci/zreplcircleci.go | 0 {version => internal/version}/version.go | 0 {zfs => internal/zfs}/datasetpath_visitor.go | 0 .../zfs}/datasetpath_visitor_test.go | 0 {zfs => internal/zfs}/encryption.go | 4 +-- ...placeholdercreateencryptionvalue_enumer.go | 0 {zfs => internal/zfs}/holds.go | 4 +-- {zfs => internal/zfs}/mapping.go | 2 +- {zfs => internal/zfs}/namecheck.go | 0 {zfs => internal/zfs}/namecheck_test.go | 0 {zfs => internal/zfs}/placeholder.go | 2 +- {zfs => internal/zfs}/prometheus.go | 0 {zfs => internal/zfs}/property/property.go | 0 .../zfs}/propertysource_enumer.go | 0 {zfs => internal/zfs}/resume_token.go | 4 +-- .../zfs}/test_helpers/exec_mapping_good.sh | 0 .../zfs}/test_helpers/zfs_failer.sh | 0 {zfs => internal/zfs}/versions.go | 0 {zfs => internal/zfs}/versions_destroy.go | 4 +-- .../zfs}/versions_destroy_test.go | 2 +- {zfs => internal/zfs}/zfs.go | 10 +++--- {zfs => internal/zfs}/zfs_debug.go | 0 {zfs => internal/zfs}/zfs_pipe.go | 0 {zfs => internal/zfs}/zfs_pipe_linux.go | 2 +- {zfs => internal/zfs}/zfs_test.go | 4 +-- .../zfscmd/zfscmd-logging-scraper/README.md | 0 .../zfscmd-logging-scraper/analysis.ipynb | 0 .../scrape_graylog_csv.bash | 0 .../zfscmd_logging_scraper.go | 2 +- .../zfscmd_logging_scrapter_test.go | 2 +- {zfs => internal/zfs}/zfscmd/zfscmd.go | 4 +-- .../zfs}/zfscmd/zfscmd_context.go | 4 +-- .../zfs}/zfscmd/zfscmd_logging.go | 0 .../zfs}/zfscmd/zfscmd_platform_test.bash | 0 .../zfs}/zfscmd/zfscmd_platform_test.go | 2 +- .../zfs}/zfscmd/zfscmd_prometheus.go | 0 {zfs => internal/zfs}/zfscmd/zfscmd_report.go | 0 main.go | 8 ++--- packaging/deb/debian/rules | 2 +- packaging/rpm/zrepl.spec | 2 +- 360 files changed, 507 insertions(+), 507 deletions(-) rename {cli => internal/cli}/cli.go (97%) rename {client => internal/client}/configcheck.go (93%) rename {client => internal/client}/jsonclient.go (100%) rename {client => internal/client}/migrate.go (97%) rename {client => internal/client}/migrate_test.go (100%) rename {client => internal/client}/pprof.go (80%) rename {client => internal/client}/pprof_activity_trace.go (95%) rename {client => internal/client}/pprof_listen.go (92%) rename {client => internal/client}/signal.go (86%) rename {client => internal/client}/status/client/client.go (98%) rename {client => internal/client}/status/status.go (91%) rename {client => internal/client}/status/status_dump.go (95%) rename {client => internal/client}/status/status_interactive.go (99%) rename {client => internal/client}/status/status_legacy.go (98%) rename {client => internal/client}/status/status_raw.go (100%) rename {client => internal/client}/status/viewmodel/bytecountbinary.go (100%) rename {client => internal/client}/status/viewmodel/bytesprogresshistory.go (100%) rename {client => internal/client}/status/viewmodel/render.go (98%) rename {client => internal/client}/status/viewmodel/stringbuilder/stringbuilder.go (100%) rename {client => internal/client}/stdinserver.go (93%) rename {client => internal/client}/testcmd.go (97%) rename {client => internal/client}/version.go (91%) rename {client => internal/client}/zfsabstractions.go (96%) rename {client => internal/client}/zfsabstractions_create.go (88%) rename {client => internal/client}/zfsabstractions_create_step_hold.go (91%) rename {client => internal/client}/zfsabstractions_list.go (93%) rename {client => internal/client}/zfsabstractions_release.go (97%) rename {config => internal/config}/config.go (99%) rename {config => internal/config}/config_dep_test.go (100%) rename {config => internal/config}/config_duration.go (100%) rename {config => internal/config}/config_global_test.go (100%) rename {config => internal/config}/config_jobid_test.go (100%) rename {config => internal/config}/config_minimal_test.go (100%) rename {config => internal/config}/config_positiveintervalormanual_test.go (100%) rename {config => internal/config}/config_recv_test.go (97%) rename {config => internal/config}/config_send_test.go (100%) rename {config => internal/config}/config_snapshotting_test.go (100%) rename {config => internal/config}/config_test.go (97%) rename {config => internal/config}/config_transport_test.go (100%) rename {config => internal/config}/retentiongrid.go (100%) rename {config => internal/config}/samples/bandwidth_limit.yml (100%) rename {config => internal/config}/samples/empty.yml (100%) rename {config => internal/config}/samples/hooks/template.sh (100%) rename {config => internal/config}/samples/local.yml (100%) rename {config => internal/config}/samples/pull.yml (100%) rename {config => internal/config}/samples/pull_ssh.yml (100%) rename {config => internal/config}/samples/push.yml (100%) rename {config => internal/config}/samples/quickstart_backup_to_external_disk.yml (100%) rename {config => internal/config}/samples/quickstart_continuous_server_backup_receiver.yml (100%) rename {config => internal/config}/samples/quickstart_continuous_server_backup_sender.yml (100%) rename {config => internal/config}/samples/quickstart_fan_out_replication_source.yml (100%) rename {config => internal/config}/samples/quickstart_fan_out_replication_target.yml (100%) rename {config => internal/config}/samples/sink.yml (100%) rename {config => internal/config}/samples/snap.yml (100%) rename {config => internal/config}/samples/snap_cron.yml (100%) rename {config => internal/config}/samples/source.yml (100%) rename {config => internal/config}/samples/source_ssh.yml (100%) rename {daemon => internal/daemon}/control.go (95%) rename {daemon => internal/daemon}/daemon.go (91%) rename {daemon => internal/daemon}/filters/fsmapfilter.go (98%) rename {daemon => internal/daemon}/filters/fsmapfilter_test.go (97%) rename {daemon => internal/daemon}/hooks/edge_string.go (100%) rename {daemon => internal/daemon}/hooks/hook_config.go (92%) rename {daemon => internal/daemon}/hooks/hook_docs.go (100%) rename {daemon => internal/daemon}/hooks/hook_exec.go (99%) rename {daemon => internal/daemon}/hooks/hook_logging.go (92%) rename {daemon => internal/daemon}/hooks/hook_type_callback.go (94%) rename {daemon => internal/daemon}/hooks/hook_type_command.go (95%) rename {daemon => internal/daemon}/hooks/hook_type_mysql_lock_tables.go (96%) rename {daemon => internal/daemon}/hooks/hook_type_postgres_checkpoint.go (94%) rename {daemon => internal/daemon}/hooks/hooks_test.go (98%) rename {daemon => internal/daemon}/hooks/stepstatus_enumer.go (100%) rename {daemon => internal/daemon}/hooks/test/test-error.sh (100%) rename {daemon => internal/daemon}/hooks/test/test-large-stdout.sh (100%) rename {daemon => internal/daemon}/hooks/test/test-post-error.sh (100%) rename {daemon => internal/daemon}/hooks/test/test-pre-error-post-ok.sh (100%) rename {daemon => internal/daemon}/hooks/test/test-report-env.sh (100%) rename {daemon => internal/daemon}/hooks/test/test-timeout.sh (100%) rename {daemon => internal/daemon}/job/active.go (95%) rename {daemon => internal/daemon}/job/active_test.go (84%) rename {daemon => internal/daemon}/job/activesidestate_enumer.go (100%) rename {daemon => internal/daemon}/job/build_jobs.go (96%) rename {daemon => internal/daemon}/job/build_jobs_sendrecvoptions.go (92%) rename {daemon => internal/daemon}/job/build_jobs_test.go (98%) rename {daemon => internal/daemon}/job/job.go (92%) rename {daemon => internal/daemon}/job/passive.go (91%) rename {daemon => internal/daemon}/job/reset/reset.go (100%) rename {daemon => internal/daemon}/job/snapjob.go (90%) rename {daemon => internal/daemon}/job/wakeup/wakeup.go (100%) rename {daemon => internal/daemon}/logging/build_logging.go (97%) rename {daemon => internal/daemon}/logging/logging_context.go (100%) rename {daemon => internal/daemon}/logging/logging_formatters.go (99%) rename {daemon => internal/daemon}/logging/logging_outlets.go (98%) rename {daemon => internal/daemon}/logging/trace/trace.go (99%) rename {daemon => internal/daemon}/logging/trace/trace_callback.go (95%) rename {daemon => internal/daemon}/logging/trace/trace_chrometrace.go (99%) rename {daemon => internal/daemon}/logging/trace/trace_context.go (100%) rename {daemon => internal/daemon}/logging/trace/trace_convenience.go (100%) rename {daemon => internal/daemon}/logging/trace/trace_convenience_test.go (94%) rename {daemon => internal/daemon}/logging/trace/trace_debug.go (85%) rename {daemon => internal/daemon}/logging/trace/trace_genID.go (92%) rename {daemon => internal/daemon}/logging/trace/trace_test.go (100%) rename {daemon => internal/daemon}/logging/trace/trace_unique_concurrent_task_namer.go (100%) rename {daemon => internal/daemon}/logging/trace/trace_unique_concurrent_task_namer_test.go (100%) rename {daemon => internal/daemon}/main.go (77%) rename {daemon => internal/daemon}/nethelpers/helpers.go (100%) rename {daemon => internal/daemon}/pprof.go (95%) rename {daemon => internal/daemon}/prometheus.go (86%) rename {daemon => internal/daemon}/pruner/pruner.go (98%) rename {daemon => internal/daemon}/pruner/pruner_queue.go (100%) rename {daemon => internal/daemon}/pruner/state_enumer.go (100%) rename {daemon => internal/daemon}/snapper/cron.go (92%) rename {daemon => internal/daemon}/snapper/cron_test.go (97%) rename {daemon => internal/daemon}/snapper/impl.go (96%) rename {daemon => internal/daemon}/snapper/manual.go (100%) rename {daemon => internal/daemon}/snapper/periodic.go (95%) rename {daemon => internal/daemon}/snapper/snapname/snapname.go (92%) rename {daemon => internal/daemon}/snapper/snapname/timestamp/timestamp.go (100%) rename {daemon => internal/daemon}/snapper/snapname/timestamp/timestamp_test.go (100%) rename {daemon => internal/daemon}/snapper/snapper.go (90%) rename {daemon => internal/daemon}/snapper/snapstate_string.go (100%) rename {daemon => internal/daemon}/snapper/state_string.go (100%) rename {daemon => internal/daemon}/snapper/util.go (74%) rename {endpoint => internal/endpoint}/context.go (72%) rename {endpoint => internal/endpoint}/endpoint.go (98%) rename {endpoint => internal/endpoint}/endpoint_abstractions_cache.go (98%) rename {endpoint => internal/endpoint}/endpoint_guarantees.go (98%) rename {endpoint => internal/endpoint}/endpoint_metrics.go (100%) rename {endpoint => internal/endpoint}/endpoint_zfs_abstraction.go (99%) rename {endpoint => internal/endpoint}/endpoint_zfs_abstraction_last_received_hold.go (98%) rename {endpoint => internal/endpoint}/endpoint_zfs_abstraction_replication_cursor.go (99%) rename {endpoint => internal/endpoint}/endpoint_zfs_abstraction_step_hold.go (98%) rename {endpoint => internal/endpoint}/endpoint_zfs_abstraction_test.go (99%) rename {endpoint => internal/endpoint}/endpoint_zfs_helpers_repr.go (97%) rename {endpoint => internal/endpoint}/endpoint_zfs_helpers_repr_test.go (100%) rename {endpoint => internal/endpoint}/endpoint_zfs_helpers_types.go (98%) rename {endpoint => internal/endpoint}/jobid.go (97%) rename {endpoint => internal/endpoint}/placeholdercreationencryptionproperty_enumer.go (100%) rename {endpoint => internal/endpoint}/replicationguaranteekind_enumer.go (100%) rename {logger => internal/logger}/datastructures.go (100%) rename {logger => internal/logger}/logger.go (100%) rename {logger => internal/logger}/logger_test.go (94%) rename {logger => internal/logger}/nulllogger.go (100%) rename {logger => internal/logger}/stderrlogger.go (100%) rename {logger => internal/logger}/testlogger.go (100%) rename {platformtest => internal/platformtest}/harness/harness.go (95%) rename {platformtest => internal/platformtest}/harness/harness_test.go (100%) rename {platformtest => internal/platformtest}/logmockzfs/logzfsenv (100%) rename {platformtest => internal/platformtest}/logmockzfs/zfs (100%) rename {platformtest => internal/platformtest}/platformtest.go (100%) rename {platformtest => internal/platformtest}/platformtest_exec.go (96%) rename {platformtest => internal/platformtest}/platformtest_logging.go (65%) rename {platformtest => internal/platformtest}/platformtest_ops.go (100%) rename {platformtest => internal/platformtest}/platformtest_parser_test.go (100%) rename {platformtest => internal/platformtest}/platformtest_zpool.go (98%) rename {platformtest => internal/platformtest}/tests/batchDestroy.go (92%) rename {platformtest => internal/platformtest}/tests/gen/gen.go (100%) rename {platformtest => internal/platformtest}/tests/generated_cases.go (100%) rename {platformtest => internal/platformtest}/tests/getNonexistent.go (93%) rename {platformtest => internal/platformtest}/tests/helpers.go (95%) rename {platformtest => internal/platformtest}/tests/holds.go (88%) rename {platformtest => internal/platformtest}/tests/idempotentBookmark.go (93%) rename {platformtest => internal/platformtest}/tests/idempotentDestroy.go (94%) rename {platformtest => internal/platformtest}/tests/idempotentHold.go (87%) rename {platformtest => internal/platformtest}/tests/listFilesystemVersions.go (98%) rename {platformtest => internal/platformtest}/tests/listFilesystems.go (90%) rename {platformtest => internal/platformtest}/tests/recvForceIntoEncryptedErr.go (91%) rename {platformtest => internal/platformtest}/tests/recvRollback.go (91%) rename {platformtest => internal/platformtest}/tests/replication.go (98%) rename {platformtest => internal/platformtest}/tests/replicationCursor.go (95%) rename {platformtest => internal/platformtest}/tests/resumableRecvAndTokenHandling.go (92%) rename {platformtest => internal/platformtest}/tests/resumeTokenParsing.go (97%) rename {platformtest => internal/platformtest}/tests/resumeTokensGenerate.bash (100%) rename {platformtest => internal/platformtest}/tests/sendArgsValidation.go (97%) rename {platformtest => internal/platformtest}/tests/sendStream.go (97%) rename {platformtest => internal/platformtest}/tests/tests.go (84%) rename {platformtest => internal/platformtest}/tests/undestroyableSnapshotParsing.go (91%) rename {pruning => internal/pruning}/keep_grid.go (96%) rename {pruning => internal/pruning}/keep_helpers.go (100%) rename {pruning => internal/pruning}/keep_helpers_test.go (100%) rename {pruning => internal/pruning}/keep_last_n.go (100%) rename {pruning => internal/pruning}/keep_last_n_test.go (100%) rename {pruning => internal/pruning}/keep_not_replicated.go (100%) rename {pruning => internal/pruning}/keep_not_replicated_test.go (100%) rename {pruning => internal/pruning}/keep_regex.go (100%) rename {pruning => internal/pruning}/keep_regex_test.go (100%) rename {pruning => internal/pruning}/pruning.go (97%) rename {pruning => internal/pruning}/pruning_test.go (100%) rename {pruning => internal/pruning}/retentiongrid/retentiongrid.go (100%) rename {pruning => internal/pruning}/retentiongrid/retentiongrid_test.go (100%) rename {replication => internal/replication}/design.md (100%) rename {replication => internal/replication}/driver/errorclass_enumer.go (100%) rename {replication => internal/replication}/driver/replication_driver.go (99%) rename {replication => internal/replication}/driver/replication_driver_debug.go (100%) rename {replication => internal/replication}/driver/replication_driver_logging.go (61%) rename {replication => internal/replication}/driver/replication_driver_test.go (98%) rename {replication => internal/replication}/driver/replication_stepqueue.go (97%) rename {replication => internal/replication}/driver/replication_stepqueue_test.go (98%) rename {replication => internal/replication}/logic/diff/diff.go (98%) rename {replication => internal/replication}/logic/diff/diff_test.go (98%) rename {replication => internal/replication}/logic/initialreplicationautoresolution_enumer.go (100%) rename {replication => internal/replication}/logic/pdu/pdu.pb.go (100%) rename {replication => internal/replication}/logic/pdu/pdu.proto (100%) rename {replication => internal/replication}/logic/pdu/pdu_extras.go (98%) rename {replication => internal/replication}/logic/pdu/pdu_grpc.pb.go (100%) rename {replication => internal/replication}/logic/pdu/pdu_test.go (100%) rename {replication => internal/replication}/logic/replication_logic.go (97%) rename {replication => internal/replication}/logic/replication_logic_context.go (62%) rename {replication => internal/replication}/logic/replication_logic_policy.go (97%) rename {replication => internal/replication}/replication.go (86%) rename {replication => internal/replication}/report/replication_report.go (100%) rename {rpc => internal/rpc}/dataconn/base2bufpool/base2bufpool.go (100%) rename {rpc => internal/rpc}/dataconn/base2bufpool/base2bufpool_test.go (100%) rename {rpc => internal/rpc}/dataconn/base2bufpool/nofitbehavior_enumer.go (100%) rename {rpc => internal/rpc}/dataconn/dataconn_client.go (97%) rename {rpc => internal/rpc}/dataconn/dataconn_debug.go (100%) rename {rpc => internal/rpc}/dataconn/dataconn_server.go (97%) rename {rpc => internal/rpc}/dataconn/dataconn_shared.go (100%) rename {rpc => internal/rpc}/dataconn/dataconn_test.go (100%) rename {rpc => internal/rpc}/dataconn/frameconn/frameconn.go (99%) rename {rpc => internal/rpc}/dataconn/frameconn/frameconn_prometheus.go (100%) rename {rpc => internal/rpc}/dataconn/frameconn/frameconn_shutdown_fsm.go (100%) rename {rpc => internal/rpc}/dataconn/frameconn/frameconn_test.go (100%) rename {rpc => internal/rpc}/dataconn/heartbeatconn/heartbeatconn.go (97%) rename {rpc => internal/rpc}/dataconn/heartbeatconn/heartbeatconn_debug.go (100%) rename {rpc => internal/rpc}/dataconn/heartbeatconn/heartbeatconn_test.go (88%) rename {rpc => internal/rpc}/dataconn/heartbeatconn/integration_test_variablereceiverate/heartbeatconn_integration_variablereceiverate.go (97%) rename {rpc => internal/rpc}/dataconn/microbenchmark/microbenchmark.go (92%) rename {rpc => internal/rpc}/dataconn/stream/stream.go (97%) rename {rpc => internal/rpc}/dataconn/stream/stream_conn.go (98%) rename {rpc => internal/rpc}/dataconn/stream/stream_debug.go (100%) rename {rpc => internal/rpc}/dataconn/stream/stream_test.go (94%) rename {rpc => internal/rpc}/dataconn/timeoutconn/internal/wireevaluator/testbed/.gitignore (100%) rename {rpc => internal/rpc}/dataconn/timeoutconn/internal/wireevaluator/testbed/README.md (100%) rename {rpc => internal/rpc}/dataconn/timeoutconn/internal/wireevaluator/testbed/all.yml (100%) rename {rpc => internal/rpc}/dataconn/timeoutconn/internal/wireevaluator/testbed/gen_files.sh (100%) rename {rpc => internal/rpc}/dataconn/timeoutconn/internal/wireevaluator/testbed/internal_prepare_and_run_repeated.yml (100%) rename {rpc => internal/rpc}/dataconn/timeoutconn/internal/wireevaluator/testbed/internal_run_test_prepared_single.yml (100%) rename {rpc => internal/rpc}/dataconn/timeoutconn/internal/wireevaluator/testbed/inventory.example (100%) rename {rpc => internal/rpc}/dataconn/timeoutconn/internal/wireevaluator/testbed/templates/ssh.yml.j2 (100%) rename {rpc => internal/rpc}/dataconn/timeoutconn/internal/wireevaluator/testbed/templates/tcp.yml.j2 (100%) rename {rpc => internal/rpc}/dataconn/timeoutconn/internal/wireevaluator/testbed/templates/tls.yml.j2 (100%) rename {rpc => internal/rpc}/dataconn/timeoutconn/internal/wireevaluator/wireevaluator.go (93%) rename {rpc => internal/rpc}/dataconn/timeoutconn/internal/wireevaluator/wireevaluator_closewrite.go (98%) rename {rpc => internal/rpc}/dataconn/timeoutconn/internal/wireevaluator/wireevaluator_deadlines.go (98%) rename {rpc => internal/rpc}/dataconn/timeoutconn/timeoutconn.go (100%) rename {rpc => internal/rpc}/dataconn/timeoutconn/timeoutconn_readv_unsupported.go (100%) rename {rpc => internal/rpc}/dataconn/timeoutconn/timeoutconn_test.go (97%) rename {rpc => internal/rpc}/dataconn/timeoutconn/timoutconn_readv.go (100%) rename {rpc => internal/rpc}/grpcclientidentity/authlistener_grpc_adaptor.go (98%) rename {rpc => internal/rpc}/grpcclientidentity/example/grpcauth.proto (100%) rename {rpc => internal/rpc}/grpcclientidentity/example/main.go (89%) rename {rpc => internal/rpc}/grpcclientidentity/example/pdu/grpcauth.pb.go (100%) rename {rpc => internal/rpc}/grpcclientidentity/example/pdu/grpcauth_grpc.pb.go (100%) rename {rpc => internal/rpc}/grpcclientidentity/grpchelper/authlistener_grpc_adaptor_wrapper.go (94%) rename {rpc => internal/rpc}/netadaptor/authlistener_netlistener_adaptor.go (95%) rename {rpc => internal/rpc}/rpc_client.go (93%) rename {rpc => internal/rpc}/rpc_debug.go (100%) rename {rpc => internal/rpc}/rpc_doc.go (100%) rename {rpc => internal/rpc}/rpc_logging.go (81%) rename {rpc => internal/rpc}/rpc_mux.go (90%) rename {rpc => internal/rpc}/rpc_server.go (91%) rename {rpc => internal/rpc}/transportmux/transportmux.go (97%) rename {rpc => internal/rpc}/versionhandshake/versionhandshake.go (100%) rename {rpc => internal/rpc}/versionhandshake/versionhandshake_test.go (98%) rename {rpc => internal/rpc}/versionhandshake/versionhandshake_transport_wrappers.go (97%) rename {tlsconf => internal/tlsconf}/tlsconf.go (100%) rename {transport => internal/transport}/fromconfig/transport_fromconfig.go (84%) rename {transport => internal/transport}/local/connect_local.go (92%) rename {transport => internal/transport}/local/serve_local.go (97%) rename {transport => internal/transport}/ssh/connect_ssh.go (93%) rename {transport => internal/transport}/ssh/serve_stdinserver.go (96%) rename {transport => internal/transport}/tcp/connect_tcp.go (85%) rename {transport => internal/transport}/tcp/serve_tcp.go (90%) rename {transport => internal/transport}/tcp/serve_tcp_ipmap.go (98%) rename {transport => internal/transport}/tcp/serve_tcp_ipmap_test.go (100%) rename {transport => internal/transport}/tls/connect_tls.go (90%) rename {transport => internal/transport}/tls/serve_tls.go (93%) rename {transport => internal/transport}/tls/tls_wire_adaptor.go (100%) rename {transport => internal/transport}/transport.go (89%) rename {util => internal/util}/bandwidthlimit/bandwidthlimit.go (100%) rename {util => internal/util}/bandwidthlimit/bandwidthlimit_test.go (100%) rename {util => internal/util}/bytecounter/bytecounter_readcloser.go (100%) rename {util => internal/util}/chainedio/chainedio_readcloser.go (100%) rename {util => internal/util}/chainlock/chainlock.go (100%) rename {util => internal/util}/choices/choices.go (100%) rename {util => internal/util}/choices/choices_test.go (95%) rename {util => internal/util}/chunking/chunking.go (100%) rename {util => internal/util}/chunking/chunking_test.go (100%) rename {util => internal/util}/circlog/circlog.go (100%) rename {util => internal/util}/circlog/circlog_test.go (98%) rename {util => internal/util}/circlog/nextpow2int_test.go (100%) rename {util => internal/util}/connlogger/connlogger.go (100%) rename {util => internal/util}/datasizeunit/datasizeunit.go (100%) rename {util => internal/util}/datasizeunit/datasizeunit_test.go (100%) rename {util => internal/util}/devnoop/devnoop.go (100%) rename {util => internal/util}/envconst/envconst.go (100%) rename {util => internal/util}/envconst/envconst_test.go (95%) rename {util => internal/util}/errorarray/errorarray.go (100%) rename {util => internal/util}/iocommand/iocommand.go (98%) rename {util => internal/util}/limitio/limitio.go (100%) rename {util => internal/util}/limitio/limitio_readcloser_test.go (100%) rename {util => internal/util}/nodefault/nodefault.go (100%) rename {util => internal/util}/nodefault/nodefault_bool.go (100%) rename {util => internal/util}/optionaldeadline/optionaldeadline.go (100%) rename {util => internal/util}/optionaldeadline/optionaldeadline_test.go (96%) rename {util => internal/util}/semaphore/semaphore.go (92%) rename {util => internal/util}/semaphore/semaphore_test.go (95%) rename {util => internal/util}/socketpair/socketpair.go (100%) rename {util => internal/util}/socketpair/socketpair_test.go (100%) rename {util => internal/util}/suspendresumesafetimer/suspendresumesafetimer.go (98%) rename {util => internal/util}/tcpsock/tcpsock.go (100%) rename {util => internal/util}/tcpsock/tcpsock_freebind_freebsd.go (100%) rename {util => internal/util}/tcpsock/tcpsock_freebind_linux.go (100%) rename {util => internal/util}/tcpsock/tcpsock_freebind_unsupported.go (100%) rename {util => internal/util}/zreplcircleci/zreplcircleci.go (100%) rename {version => internal/version}/version.go (100%) rename {zfs => internal/zfs}/datasetpath_visitor.go (100%) rename {zfs => internal/zfs}/datasetpath_visitor_test.go (100%) rename {zfs => internal/zfs}/encryption.go (95%) rename {zfs => internal/zfs}/filesystemplaceholdercreateencryptionvalue_enumer.go (100%) rename {zfs => internal/zfs}/holds.go (97%) rename {zfs => internal/zfs}/mapping.go (98%) rename {zfs => internal/zfs}/namecheck.go (100%) rename {zfs => internal/zfs}/namecheck_test.go (100%) rename {zfs => internal/zfs}/placeholder.go (99%) rename {zfs => internal/zfs}/prometheus.go (100%) rename {zfs => internal/zfs}/property/property.go (100%) rename {zfs => internal/zfs}/propertysource_enumer.go (100%) rename {zfs => internal/zfs}/resume_token.go (98%) rename {zfs => internal/zfs}/test_helpers/exec_mapping_good.sh (100%) rename {zfs => internal/zfs}/test_helpers/zfs_failer.sh (100%) rename {zfs => internal/zfs}/versions.go (100%) rename {zfs => internal/zfs}/versions_destroy.go (98%) rename {zfs => internal/zfs}/versions_destroy_test.go (99%) rename {zfs => internal/zfs}/zfs.go (99%) rename {zfs => internal/zfs}/zfs_debug.go (100%) rename {zfs => internal/zfs}/zfs_pipe.go (100%) rename {zfs => internal/zfs}/zfs_pipe_linux.go (95%) rename {zfs => internal/zfs}/zfs_test.go (99%) rename {zfs => internal/zfs}/zfscmd/zfscmd-logging-scraper/README.md (100%) rename {zfs => internal/zfs}/zfscmd/zfscmd-logging-scraper/analysis.ipynb (100%) rename {zfs => internal/zfs}/zfscmd/zfscmd-logging-scraper/scrape_graylog_csv.bash (100%) rename {zfs => internal/zfs}/zfscmd/zfscmd-logging-scraper/zfscmd_logging_scraper.go (98%) rename {zfs => internal/zfs}/zfscmd/zfscmd-logging-scraper/zfscmd_logging_scrapter_test.go (98%) rename {zfs => internal/zfs}/zfscmd/zfscmd.go (97%) rename {zfs => internal/zfs}/zfscmd/zfscmd_context.go (87%) rename {zfs => internal/zfs}/zfscmd/zfscmd_logging.go (100%) rename {zfs => internal/zfs}/zfscmd/zfscmd_platform_test.bash (100%) rename {zfs => internal/zfs}/zfscmd/zfscmd_platform_test.go (98%) rename {zfs => internal/zfs}/zfscmd/zfscmd_prometheus.go (100%) rename {zfs => internal/zfs}/zfscmd/zfscmd_report.go (100%) diff --git a/Makefile b/Makefile index 7d55740..584fb35 100644 --- a/Makefile +++ b/Makefile @@ -177,14 +177,14 @@ wrapup-and-checksum: tar --mtime='1970-01-01' --sort=name \ --transform 's/$(ARTIFACTDIR)/zrepl-$(_ZREPL_VERSION)-noarch/' \ --transform 's#dist#zrepl-$(_ZREPL_VERSION)-noarch/dist#' \ - --transform 's#config/samples#zrepl-$(_ZREPL_VERSION)-noarch/config#' \ + --transform 's#internal/config/samples#zrepl-$(_ZREPL_VERSION)-noarch/config#' \ -acf $(NOARCH_TARBALL) \ $(ARTIFACTDIR)/docs/html \ $(ARTIFACTDIR)/bash_completion \ $(ARTIFACTDIR)/_zrepl.zsh_completion \ $(ARTIFACTDIR)/go_env.txt \ dist \ - config/samples + internal/config/samples rm -rf "$(ARTIFACTDIR)/release" mkdir -p "$(ARTIFACTDIR)/release" cp -l $(ARTIFACTDIR)/zrepl* \ @@ -282,7 +282,7 @@ cover-platform: TEST_PLATFORM_BIN_PATH := $(ARTIFACTDIR)/platformtest-$(ZREPL_TARGET_TUPLE) test-platform-bin: - $(GO_BUILD) -o "$(TEST_PLATFORM_BIN_PATH)" ./platformtest/harness + $(GO_BUILD) -o "$(TEST_PLATFORM_BIN_PATH)" ./internal/platformtest/harness test-platform: export _TEST_PLATFORM_CMD="\"$(TEST_PLATFORM_BIN_PATH)\""; \ $(MAKE) _test-or-cover-platform-impl @@ -299,7 +299,7 @@ ifndef _TEST_PLATFORM_CMD endif rm -f "$(ZREPL_PLATFORMTEST_ZFS_LOG)" rm -f "$(ARTIFACTDIR)/platformtest.cover" - platformtest/logmockzfs/logzfsenv "$(ZREPL_PLATFORMTEST_ZFS_LOG)" `which zfs` \ + internal/platformtest/logmockzfs/logzfsenv "$(ZREPL_PLATFORMTEST_ZFS_LOG)" `which zfs` \ $(_TEST_PLATFORM_CMD) \ -poolname "$(ZREPL_PLATFORMTEST_POOLNAME)" \ -imagepath "$(ZREPL_PLATFORMTEST_IMAGEPATH)" \ diff --git a/docs/conf.py b/docs/conf.py index 28a9a41..79e3cab 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -181,7 +181,7 @@ texinfo_documents = [ extlinks = { 'issue':('https://github.com/zrepl/zrepl/issues/%s', 'issue #%s'), 'repomasterlink':('https://github.com/zrepl/zrepl/blob/master/%s', '%s'), - 'sampleconf':('https://github.com/zrepl/zrepl/blob/master/config/samples%s', 'config/samples%s'), + 'sampleconf':('https://github.com/zrepl/zrepl/blob/master/internal/config/samples%s', 'internal/config/samples%s'), 'commit':('https://github.com/zrepl/zrepl/commit/%s', 'commit %s'), } diff --git a/docs/quickstart/backup_to_external_disk.rst b/docs/quickstart/backup_to_external_disk.rst index 6019bcf..5e47545 100644 --- a/docs/quickstart/backup_to_external_disk.rst +++ b/docs/quickstart/backup_to_external_disk.rst @@ -31,7 +31,7 @@ A few additional requirements: The following config snippet implements the setup described above. You will likely want to customize some aspects mentioned in the top comment in the file. -.. literalinclude:: ../../config/samples/quickstart_backup_to_external_disk.yml +.. literalinclude:: ../../internal/config/samples/quickstart_backup_to_external_disk.yml Offline Backups with two (or more) External Disks @@ -43,7 +43,7 @@ To accomplish this, * create one zpool per external HDD, each with a unique name, and * define a pair of ``push`` and ``sink`` job **for each** of these zpools, each with a unique ``name``, ``listener_name``, and ``root_fs``. -The unique names ensure that the jobs don't step on each others' toes when managing :ref:`zrepl's ZFS abstractions ` . +The unique names ensure that the jobs don't step on each others' toes when managing :ref:`zrepl's ZFS abstractions ` . -:ref:`Click here ` to go back to the quickstart guide. \ No newline at end of file +:ref:`Click here ` to go back to the quickstart guide. diff --git a/docs/quickstart/continuous_server_backup.rst b/docs/quickstart/continuous_server_backup.rst index ef76d8c..2f01810 100644 --- a/docs/quickstart/continuous_server_backup.rst +++ b/docs/quickstart/continuous_server_backup.rst @@ -77,7 +77,7 @@ Configure server ``prod`` We define a **push job** named ``prod_to_backups`` in ``/etc/zrepl/zrepl.yml`` on host ``prod`` : -.. literalinclude:: ../../config/samples/quickstart_continuous_server_backup_sender.yml +.. literalinclude:: ../../internal/config/samples/quickstart_continuous_server_backup_sender.yml .. _tutorial-configure-prod: @@ -86,7 +86,7 @@ Configure server ``backups`` We define a corresponding **sink job** named ``sink`` in ``/etc/zrepl/zrepl.yml`` on host ``backups`` : -.. literalinclude:: ../../config/samples/quickstart_continuous_server_backup_receiver.yml +.. literalinclude:: ../../internal/config/samples/quickstart_continuous_server_backup_receiver.yml Go Back To Quickstart Guide --------------------------- diff --git a/docs/quickstart/fan_out_replication.rst b/docs/quickstart/fan_out_replication.rst index 6c546e9..d986777 100644 --- a/docs/quickstart/fan_out_replication.rst +++ b/docs/quickstart/fan_out_replication.rst @@ -80,12 +80,12 @@ Mutual TLS via the :ref:`TLS client authentication transport