diff options
author | Micael Karlberg <[email protected]> | 2012-01-26 13:59:02 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2012-01-26 13:59:02 +0100 |
commit | 85d10462a8696c7c043a342ac0b1929c1bc004a6 (patch) | |
tree | 91585805e0250e26d95682749f9646259ecffb1e /lib/snmp/src/agent | |
parent | e3a9039d7c8f362b00420361a9ed174d0467470e (diff) | |
download | otp-85d10462a8696c7c043a342ac0b1929c1bc004a6.tar.gz otp-85d10462a8696c7c043a342ac0b1929c1bc004a6.tar.bz2 otp-85d10462a8696c7c043a342ac0b1929c1bc004a6.zip |
[snmp/agent] Added backup check for local_db
Added a backup check also for local_db (same as for the
mib-server). Updated appup and set proper version (vsn.mk).
Finally added test case for issue.
OTP-9884
Diffstat (limited to 'lib/snmp/src/agent')
-rw-r--r-- | lib/snmp/src/agent/snmpa_local_db.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/snmp/src/agent/snmpa_local_db.erl b/lib/snmp/src/agent/snmpa_local_db.erl index d9d6e633de..0babc74d16 100644 --- a/lib/snmp/src/agent/snmpa_local_db.erl +++ b/lib/snmp/src/agent/snmpa_local_db.erl @@ -486,7 +486,11 @@ handle_call({match, Name, Db, Pattern}, _From, State) -> L1 = match(Db, Name, Pattern, State), {reply, lists:delete([undef], L1), State}; -handle_call({backup, BackupDir}, From, #state{dets = Dets} = State) -> +%% This check (that there is no backup already in progress) is also +%% done in the master agent process, but just in case a user issues +%% a backup call to this process directly, we add a similar check here. +handle_call({backup, BackupDir}, From, + #state{backup = undefined, dets = Dets} = State) -> ?vlog("backup: ~p",[BackupDir]), Pid = self(), V = get(verbosity), @@ -511,6 +515,10 @@ handle_call({backup, BackupDir}, From, #state{dets = Dets} = State) -> {reply, Error, State} end; +handle_call({backup, _BackupDir}, From, #state{backup = Backup} = S) -> + ?vinfo("backup already in progress: ~p", [Backup]), + {reply, {error, backup_in_progress}, S}; + handle_call(dump, _From, #state{dets = Dets} = State) -> ?vlog("dump",[]), dets_sync(Dets), |